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

[Michael Howitz]

Log message for revision 120580:
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  - Updated tests to run on Python 2.6, too.
  
  

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

-=-
Modified: zc.blist/trunk/src/zc/blist/CHANGES.txt
===================================================================
--- zc.blist/trunk/src/zc/blist/CHANGES.txt	2011-02-25 17:30:24 UTC (rev 120579)
+++ zc.blist/trunk/src/zc/blist/CHANGES.txt	2011-02-28 07:42:44 UTC (rev 120580)
@@ -1,20 +1,25 @@
 1.0 (unreleased)
 ================
 
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
 
+- Updated tests to run on Python 2.6, too.
+
+
 1.0b2 (2009-03-12)
 ==================
 
-- fixed: internal data structures were not stored correctly in the ZODB, so
+- Fixed: internal data structures were not stored correctly in the ZODB, so
   BLists loaded from a fresh DB connection would break.
 
-- removed unused code and the dependency on rwproperty
+- Removed unused code and the dependency on rwproperty.
 
-- improved test coverage of the BList API, fixed access to items at index -1
-  or at the ends of the valid index range
+- Improved test coverage of the BList API, fixed access to items at index -1
+  or at the ends of the valid index range.
 
 
 1.0b1 (2008-10-06)
 ==================
 
-Initial release.
+- Initial release.

Modified: zc.blist/trunk/src/zc/blist/README.txt
===================================================================
--- zc.blist/trunk/src/zc/blist/README.txt	2011-02-25 17:30:24 UTC (rev 120579)
+++ zc.blist/trunk/src/zc/blist/README.txt	2011-02-28 07:42:44 UTC (rev 120580)
@@ -51,17 +51,17 @@
     >>> from zc.blist import BList
     >>> l = BList(range(1000))
     >>> l[345:351] # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> list(l[345:351])
     [345, 346, 347, 348, 349, 350]
 
     >>> l[351:345:-1] # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> list(l[351:345:-1])
     [351, 350, 349, 348, 347, 346]
 
     >>> l[345:351:2] # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> list(l[345:351:2])
     [345, 347, 349]
 
@@ -85,7 +85,7 @@
 
     >>> i = l.iterSlice(345, 351, 2)
     >>> i # doctest: +ELLIPSIS
-    <generator object at ...>
+    <generator object ...>
     >>> list(i)
     [345, 347, 349]
 

Modified: zc.blist/trunk/src/zc/blist/tests.py
===================================================================
--- zc.blist/trunk/src/zc/blist/tests.py	2011-02-25 17:30:24 UTC (rev 120579)
+++ zc.blist/trunk/src/zc/blist/tests.py	2011-02-28 07:42:44 UTC (rev 120580)
@@ -11,15 +11,13 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+import doctest
 import os
 import pickle
-import unittest
 import random
 import sys
 import traceback
-
-from zope.testing import doctest
-
+import unittest
 import zc.blist
 import zc.blist.testing
 
@@ -296,11 +294,6 @@
     return unittest.TestSuite((
         doctest.DocFileSuite(
             'README.txt',
-            'regression.txt',
-            optionflags=doctest.INTERPRET_FOOTNOTES),
+            'regression.txt'),
         unittest.TestLoader().loadTestsFromTestCase(CanaryTestCase),
         ))
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')