[CMF-checkins] SVN: CMF/branches/goldegg-phase-1/GenericSetup/ Remove cruft left over from creation of GenericSetup from CMFSetup in 1.5.

[Tres Seaver]

Log message for revision 38578:
  Remove cruft left over from creation of GenericSetup from CMFSetup in 1.5.
  

Changed:
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_context.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_differ.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_registry.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_rolemap.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_tool.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/tests/test_utils.py
  U   CMF/branches/goldegg-phase-1/GenericSetup/utils.py

-=-
Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_context.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_context.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_context.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 import os
@@ -33,9 +30,6 @@
 from OFS.Folder import Folder
 from OFS.Image import File
 
-#from Products.CMFCore.tests.base.testcase import SecurityRequestTest
-from Testing.ZopeTestCase import ZopeTestCase
-
 from common import FilesystemTestBase
 from common import SecurityRequestTest
 from common import TarballTester

Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_differ.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_differ.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_differ.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from OFS.Folder import Folder
@@ -28,11 +25,8 @@
 
 from DateTime.DateTime import DateTime
 
-#from Products.CMFCore.tests.base.testcase import SecurityRequestTest
-from Testing.ZopeTestCase import ZopeTestCase
 from common import SecurityRequestTest
 
-
 class DummySite( Folder ):
 
     pass

Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_registry.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_registry.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_registry.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from OFS.Folder import Folder

Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_rolemap.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_rolemap.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_rolemap.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from OFS.Folder import Folder

Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_tool.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_tool.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_tool.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from StringIO import StringIO
@@ -35,8 +32,6 @@
 from common import DummyImportContext
 from common import FilesystemTestBase
 
-#from Products.CMFCore.tests.base.testcase import SecurityRequestTest
-from Testing.ZopeTestCase import ZopeTestCase
 from common import SecurityRequestTest
 from common import TarballTester
 from conformance import ConformsToISetupTool

Modified: CMF/branches/goldegg-phase-1/GenericSetup/tests/test_utils.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/tests/test_utils.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/tests/test_utils.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -17,10 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError: # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from DateTime.DateTime import DateTime

Modified: CMF/branches/goldegg-phase-1/GenericSetup/utils.py
===================================================================
--- CMF/branches/goldegg-phase-1/GenericSetup/utils.py	2005-09-24 09:28:30 UTC (rev 38577)
+++ CMF/branches/goldegg-phase-1/GenericSetup/utils.py	2005-09-24 09:34:34 UTC (rev 38578)
@@ -411,7 +411,7 @@
 InitializeClass(ExportConfiguratorBase)
 
 
-# BBB: old class mixing the two, will be removed in CMF 1.7
+# BBB: old class mixing the two, will be removed in CMF 2.1
 class ConfiguratorBase(ImportConfiguratorBase, ExportConfiguratorBase):
     """ Synthesize XML description.
     """