[Zope-Checkins] CVS: Zope/lib/python/Products/ZODBMountPoint - MountedObject.py:1.1.2.2

Chris McDonough chrism at zopemafia.com
Sat Dec 20 11:58:37 EST 2003


Update of /cvs-repository/Zope/lib/python/Products/ZODBMountPoint
In directory cvs.zope.org:/tmp/cvs-serv29489

Modified Files:
      Tag: Zope-2_7-branch
	MountedObject.py 
Log Message:
Dont maintain a configuration separate from that of the global config by using a module-scope global.  This causes problems when the global config changes (the changes are not picked up here).  This is typically an issue when running unit tests.


=== Zope/lib/python/Products/ZODBMountPoint/MountedObject.py 1.1.2.1 => 1.1.2.2 ===
--- Zope/lib/python/Products/ZODBMountPoint/MountedObject.py:1.1.2.1	Mon Jul 21 12:36:30 2003
+++ Zope/lib/python/Products/ZODBMountPoint/MountedObject.py	Sat Dec 20 11:58:07 2003
@@ -24,25 +24,14 @@
 from OFS.SimpleItem import SimpleItem
 from OFS.Folder import Folder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-
 from Mount import MountPoint
 
 
 _www = os.path.join(os.path.dirname(__file__), 'www')
 
-
-configuration = None
-
 def getConfiguration():
     from App.config import getConfiguration
-    global configuration
-    if configuration is None:
-        configuration = getConfiguration().dbtab
-    return configuration
-
-def setConfiguration(c):
-    global configuration
-    configuration = c
+    return getConfiguration().dbtab
 
 class SimpleTrailblazer:
     """Follows Zope paths.  If a path is not found, creates a Folder.




More information about the Zope-Checkins mailing list