[Checkins] SVN: zope.security/trunk/ Normalize testcase module-scope imports: test_set_checkers.

Tres Seaver cvs-admin at zope.org
Fri Dec 21 01:58:31 UTC 2012


Log message for revision 128829:
  Normalize testcase module-scope imports:  test_set_checkers.

Changed:
  _U  zope.security/trunk/
  U   zope.security/trunk/src/zope/security/tests/test_set_checkers.py

-=-
Modified: zope.security/trunk/src/zope/security/tests/test_set_checkers.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_set_checkers.py	2012-12-21 01:58:29 UTC (rev 128828)
+++ zope.security/trunk/src/zope/security/tests/test_set_checkers.py	2012-12-21 01:58:30 UTC (rev 128829)
@@ -16,14 +16,11 @@
 This is a test of the assertions made in
 zope.security.checkers._default_checkers.
 """
-import sys
 import unittest
-from doctest import DocTestSuite
 
-from zope.security.checker import ProxyFactory
-from zope.security.interfaces import ForbiddenAttribute
 
 def check_forbidden_get(object, attr):
+    from zope.security.interfaces import ForbiddenAttribute
     try:
         return getattr(object, attr)
     except ForbiddenAttribute, e:
@@ -34,6 +31,8 @@
 
     with proxied sets.
 
+    >>> from zope.security.checker import ProxyFactory
+    >>> from zope.security.interfaces import ForbiddenAttribute
     >>> us = set((1, 2))
     >>> s = ProxyFactory(us)
 
@@ -199,20 +198,9 @@
 def setUpFrozenSet(test):
     test.globs['set'] = frozenset
 
-def setUpSet(test):
-    import sets
-    test.globs['set'] = sets.Set
-
-def setUpImmutableSet(test):
-    import sets
-    test.globs['set'] = sets.ImmutableSet
-
 def test_suite():
-    doctests = [
+    from doctest import DocTestSuite
+    return unittest.TestSuite((
         DocTestSuite(),
         DocTestSuite(setUp=setUpFrozenSet),
-        ]
-    if sys.version_info[:2] < (2, 6):
-        doctests.append(DocTestSuite(setUp=setUpSet))
-        doctests.append(DocTestSuite(setUp=setUpImmutableSet))
-    return unittest.TestSuite(doctests)
+    ))



More information about the checkins mailing list