[Zope-Checkins] SVN: Zope/branches/2.12/ - LP #374818: Use module-provided functions as opposed to the old

[Jens Vagelpohl]

Log message for revision 113515:
  - LP #374818: Use module-provided functions as opposed to the old
    "folder methods" when creating folders and user folders in
    ZopeTestCase.
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/Testing/ZopeTestCase/ZopeTestCase.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2010-06-16 10:19:32 UTC (rev 113514)
+++ Zope/branches/2.12/doc/CHANGES.rst	2010-06-16 10:33:22 UTC (rev 113515)
@@ -11,6 +11,10 @@
 Bugs Fixed
 ++++++++++
 
+- LP #374818: Use module-provided functions as opposed to the old 
+  "folder methods" when creating folders and user folders in 
+  ZopeTestCase.
+
 - LP #143946: Provide a more informative error message when a 
   WebDAV PUT fails.
 

Modified: Zope/branches/2.12/src/Testing/ZopeTestCase/ZopeTestCase.py
===================================================================
--- Zope/branches/2.12/src/Testing/ZopeTestCase/ZopeTestCase.py	2010-06-16 10:19:32 UTC (rev 113514)
+++ Zope/branches/2.12/src/Testing/ZopeTestCase/ZopeTestCase.py	2010-06-16 10:33:22 UTC (rev 113515)
@@ -63,14 +63,16 @@
 
     def _setupFolder(self):
         '''Creates and configures the folder.'''
-        self.app.manage_addFolder(folder_name)
+        from OFS.Folder import manage_addFolder
+        manage_addFolder(self.app, folder_name)
         self.folder = getattr(self.app, folder_name)
         self.folder._addRole(user_role)
         self.folder.manage_role(user_role, standard_permissions)
 
     def _setupUserFolder(self):
         '''Creates the user folder.'''
-        self.folder.manage_addUserFolder()
+        from AccessControl.User import manage_addUserFolder
+        manage_addUserFolder(self.folder)
 
     def _setupUser(self):
         '''Creates the default user.'''