[Checkins] SVN: zc.queue/trunk/ - Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest``.

Michael Howitz mh at gocept.com
Sun Dec 12 11:02:55 EST 2010


Log message for revision 118826:
  - Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest``.
  

Changed:
  U   zc.queue/trunk/CHANGES.txt
  U   zc.queue/trunk/src/zc/queue/tests.py

-=-
Modified: zc.queue/trunk/CHANGES.txt
===================================================================
--- zc.queue/trunk/CHANGES.txt	2010-12-12 16:01:42 UTC (rev 118825)
+++ zc.queue/trunk/CHANGES.txt	2010-12-12 16:02:54 UTC (rev 118826)
@@ -9,6 +9,8 @@
 
 - Added test extra to declare test dependency on ``zope.testing``.
 
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
 
 1.1
 ===

Modified: zc.queue/trunk/src/zc/queue/tests.py
===================================================================
--- zc.queue/trunk/src/zc/queue/tests.py	2010-12-12 16:01:42 UTC (rev 118825)
+++ zc.queue/trunk/src/zc/queue/tests.py	2010-12-12 16:02:54 UTC (rev 118826)
@@ -1,8 +1,8 @@
-import unittest
-from zope.testing import doctest, module
 from ZODB import ConflictResolution, MappingStorage, POSException
-
 from zc import queue
+from zope.testing import module
+import doctest
+import unittest
 
 # TODO: this approach is useful, but fragile.  It also puts a dependency in
 # this package on the ZODB, when otherwise it would only depend on persistent.
@@ -116,7 +116,7 @@
         >>> q_1 = root_1["q"] = queue.CompositeQueue()
         >>> q_1.put(1)
         >>> transactionmanager_1.commit()
-    
+
         >>> transactionmanager_2 = transaction.TransactionManager()
         >>> connection_2 = db.open(transaction_manager=transactionmanager_2)
         >>> root_2 = connection_2.root()
@@ -138,7 +138,7 @@
         >>> q_1 = root_1["q"] = queue.Queue()
         >>> q_1.put(1)
         >>> transactionmanager_1.commit()
-    
+
         >>> transactionmanager_2 = transaction.TransactionManager()
         >>> connection_2 = db.open(transaction_manager=transactionmanager_2)
         >>> root_2 = connection_2.root()
@@ -158,7 +158,7 @@
     CompositePersistentQueue as the expected names for the classes in this
     package.  They are now shortened, but the older names should stay
     available in _queue in perpetuity.
-    
+
         >>> import zc.queue._queue
         >>> zc.queue._queue.BucketQueue is queue.PersistentQueue
         True



More information about the checkins mailing list