[Zope3-checkins] CVS: Zope3/src/zope/app/contentdirective/tests - test_directives.py:1.9 test_factory.py:1.6 test_requirepermissions.py:1.5

[Martijn Faassen]

Update of /cvs-repository/Zope3/src/zope/app/contentdirective/tests
In directory cvs.zope.org:/tmp/cvs-serv30407/zope/app/contentdirective/tests

Modified Files:
	test_directives.py test_factory.py test_requirepermissions.py 
Log Message:
Importgeddon part the second. Removed unused imports throughout the
source tree. This should have taken care of most unused imports
in Zope 3. :)


=== Zope3/src/zope/app/contentdirective/tests/test_directives.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/contentdirective/tests/test_directives.py:1.8	Fri Mar 21 16:03:41 2003
+++ Zope3/src/zope/app/contentdirective/tests/test_directives.py	Thu May  1 15:35:14 2003
@@ -17,12 +17,9 @@
 """
 
 import unittest
-import sys
-import os
 from StringIO import StringIO
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
-from zope.configuration.xmlconfig import ZopeXMLConfigurationError
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.security.management import newSecurityManager, system_user
 from zope.security.proxy import Proxy


=== Zope3/src/zope/app/contentdirective/tests/test_factory.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/contentdirective/tests/test_factory.py:1.5	Tue Feb 11 21:17:19 2003
+++ Zope3/src/zope/app/contentdirective/tests/test_factory.py	Thu May  1 15:35:14 2003
@@ -14,11 +14,9 @@
 """ Test handler for 'factory' subdirective of 'content' directive """
 
 import unittest
-import sys
-import os
 from cStringIO import StringIO
 
-from zope.configuration.xmlconfig import xmlconfig, ZopeXMLConfigurationError
+from zope.configuration.xmlconfig import xmlconfig
 from zope.configuration.xmlconfig import XMLConfig
 from zope.app.services.servicenames import Factories
 from zope.app.tests.placelesssetup import PlacelessSetup
@@ -26,11 +24,9 @@
 
 import zope.configuration
 import zope.app.security
-from zope.app.security.exceptions import UndefinedPermissionError
-
 import zope.app.contentdirective
-from zope.app.contentdirective.tests.exampleclass \
-    import ExampleClass, IExample, IExampleContainer
+
+from zope.app.contentdirective.tests.exampleclass import ExampleClass
 
 def configfile(s):
     return StringIO("""<zopeConfigure


=== Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py:1.4	Fri Mar 21 16:03:41 2003
+++ Zope3/src/zope/app/contentdirective/tests/test_requirepermissions.py	Thu May  1 15:35:14 2003
@@ -16,9 +16,7 @@
 from cStringIO import StringIO
 from zope.app.component.globalinterfaceservice import queryInterface
 from zope.app.contentdirective.tests import module
-from zope.app.security.exceptions import UndefinedPermissionError
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.exceptions import Forbidden
 from zope.security.checker import selectChecker
 import unittest
 import zope.app.contentdirective
@@ -76,7 +74,6 @@
         "Verify that class, instance, and methods have expected permissions."
 
         from zope.security.checker import selectChecker
-        from zope.exceptions import Forbidden
 
         checker = selectChecker(module.test_instance)
         self.assertEqual(checker.permission_id('m1'), (m1P or None))
@@ -103,7 +100,6 @@
         "Verify that class, instance, and methods have expected permissions."
 
         from zope.security.checker import selectChecker
-        from zope.exceptions import Forbidden
 
         checker = selectChecker(module.test_instance)
         self.assertEqual(checker.setattr_permission_id('m1'), (m1P or None))