[Checkins] SVN: ExtensionClass/trunk/ Removed undeclared testing dependency on zope.testing. Avoid some module global imports.

[Hanno Schlichting]

Log message for revision 111623:
  Removed undeclared testing dependency on zope.testing. Avoid some module global imports.
  

Changed:
  U   ExtensionClass/trunk/CHANGES.txt
  U   ExtensionClass/trunk/src/ComputedAttribute/tests.py
  U   ExtensionClass/trunk/src/ExtensionClass/tests.py
  U   ExtensionClass/trunk/src/MethodObject/tests.py

-=-
Modified: ExtensionClass/trunk/CHANGES.txt
===================================================================
--- ExtensionClass/trunk/CHANGES.txt	2010-04-30 13:48:40 UTC (rev 111622)
+++ ExtensionClass/trunk/CHANGES.txt	2010-04-30 13:55:00 UTC (rev 111623)
@@ -4,9 +4,10 @@
 2.13.1 (unreleased)
 -------------------
 
+- Removed undeclared testing dependency on zope.testing.
+
 - Removed cruft in ``pickle/pickle.c`` related to removed ``__getnewargs__``.
 
-
 2.13.0 (2010-02-22)
 -------------------
 

Modified: ExtensionClass/trunk/src/ComputedAttribute/tests.py
===================================================================
--- ExtensionClass/trunk/src/ComputedAttribute/tests.py	2010-04-30 13:48:40 UTC (rev 111622)
+++ ExtensionClass/trunk/src/ComputedAttribute/tests.py	2010-04-30 13:55:00 UTC (rev 111623)
@@ -16,6 +16,8 @@
 Computed attributes work much like properties:
 
 >>> import math
+>>> from ComputedAttribute import ComputedAttribute
+>>> from ExtensionClass import Base
 >>> class Point(Base):
 ...    def __init__(self, x, y):
 ...        self.x, self.y = x, y
@@ -42,11 +44,14 @@
     computed attribute with a level > 0 returns a computed attribute
     with a decremented level.
 
+    >>> from ExtensionClass import Base
     >>> class X(Base):
     ...     pass
 
     >>> x = X()
     >>> x.n = 1
+
+    >>> from ComputedAttribute import ComputedAttribute
     >>> x.n2 = ComputedAttribute(lambda self: self.n*2)
     >>> x.n2
     2
@@ -66,9 +71,7 @@
     """
 
 import unittest
-from zope.testing.doctest import DocTestSuite
-from ExtensionClass import Base
-from ComputedAttribute import ComputedAttribute
+from doctest import DocTestSuite
 
 def test_suite():
     return unittest.TestSuite((DocTestSuite(),))

Modified: ExtensionClass/trunk/src/ExtensionClass/tests.py
===================================================================
--- ExtensionClass/trunk/src/ExtensionClass/tests.py	2010-04-30 13:48:40 UTC (rev 111622)
+++ ExtensionClass/trunk/src/ExtensionClass/tests.py	2010-04-30 13:55:00 UTC (rev 111623)
@@ -11,13 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
 
-$Id$
-"""
-
 from ExtensionClass import *
-import pickle
 
 
 def print_dict(d):
@@ -213,7 +208,8 @@
     
     >>> print_dict(state)
     {'__name__': 'x', 'aaa': 1, 'bbb': 'foo'}
-    
+
+    >>> import pickle
     >>> pickle.loads(pickle.dumps(x)) == x
     1
     >>> pickle.loads(pickle.dumps(x, 0)) == x
@@ -263,7 +259,8 @@
     'Custom'
     >>> ax, ay, a
     ('x', 'y', 99)
-    
+
+    >>> import pickle
     >>> pickle.loads(pickle.dumps(x)) == x
     1
     >>> pickle.loads(pickle.dumps(x, 0)) == x
@@ -306,7 +303,8 @@
     >>> d
     >>> print_dict(s)
     {'s1': 'x', 's2': 'y', 's3': 'z'}
-    
+
+    >>> import pickle
     >>> pickle.loads(pickle.dumps(x)) == x
     1
     >>> pickle.loads(pickle.dumps(x, 0)) == x
@@ -361,7 +359,8 @@
     {'aaa': 1, 'bbb': 'foo'}
     >>> print_dict(s)
     {'s1': 'x', 's2': 'y', 's3': 'z'}
-    
+
+    >>> import pickle
     >>> pickle.loads(pickle.dumps(x)) == x
     1
     >>> pickle.loads(pickle.dumps(x, 0)) == x
@@ -404,7 +403,8 @@
     {}
     >>> print_dict(s)
     {'s1': 'x', 's2': 'y', 's3': 'z'}
-    
+
+    >>> import pickle
     >>> pickle.loads(pickle.dumps(x)) == x
     1
     >>> pickle.loads(pickle.dumps(x, 0)) == x
@@ -843,7 +843,7 @@
 
 """
 
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
 import unittest
 
 def test_suite():
@@ -851,8 +851,3 @@
         DocTestSuite('ExtensionClass'),
         DocTestSuite(),
         ))
-
-if __name__ == '__main__': unittest.main()
-
-
-

Modified: ExtensionClass/trunk/src/MethodObject/tests.py
===================================================================
--- ExtensionClass/trunk/src/MethodObject/tests.py	2010-04-30 13:48:40 UTC (rev 111622)
+++ ExtensionClass/trunk/src/MethodObject/tests.py	2010-04-30 13:55:00 UTC (rev 111623)
@@ -11,14 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""XXX short summary goes here.
 
-$Id$
-"""
-import unittest
-from zope.testing.doctest import DocTestSuite
-
-def test_xxx():
+def test_methodobject():
     """
     >>> from ExtensionClass import Base
     >>> from MethodObject import Method
@@ -36,12 +30,12 @@
     >>> hi = x.hi
     >>> hi(1,2,3,name='spam')
     called bar() (1, 2, 3) {'name': 'spam'}
-    
     """
 
+
 def test_suite():
+    import unittest
+    from doctest import DocTestSuite
     return unittest.TestSuite((
         DocTestSuite(),
         ))
-
-if __name__ == '__main__': unittest.main()