[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - use getConfiguration instead of Globals

[Yvo Schubbe]

Log message for revision 120088:
  - use getConfiguration instead of Globals
  - always run DebugModeTests (test_DeleteAddEditMethod currently fails on NTFS)

Changed:
  UU  Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py	2011-02-03 15:55:13 UTC (rev 120087)
+++ Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py	2011-02-03 16:28:56 UTC (rev 120088)
@@ -11,8 +11,6 @@
 #
 ##############################################################################
 """ Views of filesystem directories as folders.
-
-$Id$
 """
 
 import logging
@@ -24,6 +22,7 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_inner, aq_parent
 from App.class_init import InitializeClass
+from App.config import getConfiguration
 from App.special_dtml import DTMLFile
 from App.special_dtml import HTMLFile
 from OFS.Folder import Folder
@@ -154,8 +153,7 @@
         return types
 
     def _changed(self):
-        import Globals  # for data
-        if not Globals.DevelopmentMode:
+        if not getConfiguration().debug_mode:
             return 0
         mtime=0
         try:


Property changes on: Products.CMFCore/trunk/Products/CMFCore/DirectoryView.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py	2011-02-03 15:55:13 UTC (rev 120087)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py	2011-02-03 16:28:56 UTC (rev 120088)
@@ -21,15 +21,16 @@
 from os.path import join
 from tempfile import mktemp
 
+from App.config import getConfiguration
+
+from Products.CMFCore.DirectoryView import DirectoryView
 from Products.CMFCore.tests import _globals
 from Products.CMFCore.tests.base.dummy import DummyFolder
 from Products.CMFCore.tests.base.testcase import FSDVTest
 from Products.CMFCore.tests.base.testcase import WarningInterceptor
 from Products.CMFCore.tests.base.testcase import WritableFSDVTest
 
-from Products.CMFCore.DirectoryView import DirectoryView
 
-
 class DummyDirectoryView(DirectoryView):
     def __of__(self, parent):
         return DummyDirectoryViewSurrogate()
@@ -233,6 +234,8 @@
 
     def setUp( self ):
         WritableFSDVTest.setUp(self)
+        self.saved_cfg_debug_mode = getConfiguration().debug_mode
+        getConfiguration().debug_mode = True
         self.test1path = join(self.skin_path_name,'test1.py')
         self.test2path = join(self.skin_path_name,'test2.py')
         self.test3path = join(self.skin_path_name,'test3')
@@ -249,6 +252,10 @@
         # add a new folder
         mkdir(self.test3path)
 
+    def tearDown(self):
+        getConfiguration().debug_mode = self.saved_cfg_debug_mode
+        WritableFSDVTest.tearDown(self)
+
     def test_AddNewMethod( self ):
         # See if a method added to the skin folder can be found
         self.assertEqual(self.ob.fake_skin.test2(),'test2')
@@ -295,12 +302,10 @@
 
 
 def test_suite():
-    import Globals # for data
-    tests = [unittest.makeSuite(DirectoryViewPathTests),
-             unittest.makeSuite(DirectoryViewTests),
-             unittest.makeSuite(DirectoryViewIgnoreTests),
-             unittest.makeSuite(DirectoryViewFolderTests),
-            ]
-    if Globals.DevelopmentMode:
-        tests.append(unittest.makeSuite(DebugModeTests))
-    return unittest.TestSuite(tests)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(DirectoryViewPathTests))
+    suite.addTest(unittest.makeSuite(DirectoryViewTests))
+    suite.addTest(unittest.makeSuite(DirectoryViewIgnoreTests))
+    suite.addTest(unittest.makeSuite(DirectoryViewFolderTests))
+    suite.addTest(unittest.makeSuite(DebugModeTests))
+    return suite