[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.168

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv22503

Modified Files:
	Application.py 
Log Message:
Added browser_id_manager, session_data_manager, and temp_folder to list of application object's reserved names (making them undeletable).

Added session_data to list of temp_folder's reserved names.


=== Zope/lib/python/OFS/Application.py 1.167 => 1.168 ===
                      'standard_html_footer',
                      'standard_error_message',
-                     'Control_Panel')
+                     'Control_Panel',
+                     'browser_id_manager',
+                     'session_data_manager',
+                     'temp_folder')
 
     # This class-default __allow_groups__ ensures that the
     # emergency user can still access the system if the top-level
@@ -421,7 +424,8 @@
 
     # b/c: Ensure that a temp folder exists
     if not hasattr(app, 'temp_folder'):
-        from Products.TemporaryFolder.TemporaryFolder import MountedTemporaryFolder
+        from Products.TemporaryFolder.TemporaryFolder import \
+             MountedTemporaryFolder
         tf = MountedTemporaryFolder('temp_folder','Temporary Folder')
         app._setObject('temp_folder', tf)
         get_transaction().note('Added temp_folder')
@@ -471,6 +475,9 @@
                       'Session Data Container', timeout_mins = timeout_spec,
                       addNotification=addnotify, delNotification = delnotify)
         tf._setObject('session_data', toc)
+        tf_reserved = getattr(tf, '_reserved_names', ())
+        if 'session_data' not in tf_reserved:
+            tf._reserved_names = tf_reserved + ('session_data',)
         get_transaction().note('Added session_data to temp_folder')
         get_transaction().commit()
         del toc