Merged r69765:69766 from 2.9 branch.

Specifying session-resolution-seconds >= 1200 caused Zope startup to fail.
Fixes http://www.zope.org/Collectors/Zope/1983

doc/CHANGES.txt

@@ -8,6 +8,9 @@ Zope Changes
 
     Bugs fixed
 
+      - Collector #1983: Specifying session-resolution-seconds >= 1200 caused
+        Zope startup to fail.
+
       - Collector #2169: webdav.Resource.COPY did not send ObjectClonedEvent.
 
   Zope 2.10.0 beta 2 (2006/08/20)

lib/python/OFS/Application.py

@@ -426,14 +426,7 @@ class AppInitializer:
                          'session-delete-notify-script-path' % delnotify)
                 delnotify=None
 
-            toc = TransientObjectContainer(
-                'session_data', 'Session Data Container',
-                addNotification = addnotify,
-                delNotification = delnotify,
-                limit=limit,
-                period_secs=period_spec)
-
-            if timeout_spec is not None:
+            if 1:  # Preserve indentation for diff
                 toc = TransientObjectContainer('session_data',
                                                'Session Data Container',
                                                timeout_mins = timeout_spec,