fix tests/doctests according to current ZTK and BlueBream versions

brain/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 from cybertools.brain.interfaces import INeuron, ISynapsis
@@ -21,7 +19,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(TestBrain),
-                DocFileSuite('README.txt',
+                doctest.DocFileSuite('README.txt',
                              optionflags=flags,),
            ))
 

browser/ftests.py

@@ -1,7 +1,6 @@
 # $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing.functional import FunctionalDocFileSuite
 
 

browser/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 
@@ -9,7 +7,7 @@ from zope.interface.verify import verifyClass
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

catalog/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.catalog' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

commerce/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.commerce' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 from zope import component
 from zope.interface import implements
@@ -62,7 +59,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags,
+        doctest.DocFileSuite('README.txt', optionflags=flags,
                      setUp=setUp, tearDown=tearDown),
         ))
 

composer/layout/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

composer/message/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

composer/report/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

composer/rule/tests.py

@@ -1,10 +1,8 @@
-# $Id$
 
 import unittest, doctest
 from email import message_from_string
 from zope.interface import implements
 from zope.sendmail.interfaces import IMailDelivery
-from zope.testing.doctestunit import DocFileSuite
 
 
 class TestMailer(object):
@@ -31,7 +29,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

composer/schema/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

composer/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

container/README.txt

@@ -12,7 +12,7 @@ Let's add an ordered container and place some objects in it:
   >>> c1['sub3'] = OrderedContainer()
   >>> c1['sub4'] = OrderedContainer()
   >>> c1.keys()
-  ['sub1', 'sub2', 'sub3', 'sub4']
+  [u'sub1', u'sub2', u'sub3', u'sub4']
       
 A special management view provides methods for moving objects down, up,
 to the bottom, and to the top
@@ -22,14 +22,14 @@ to the bottom, and to the top
   >>> view = OrderedContainerView(c1, TestRequest())
   >>> view.move_bottom(('sub3',))
   >>> c1.keys()
-  ['sub1', 'sub2', 'sub4', 'sub3']
+  [u'sub1', u'sub2', u'sub4', u'sub3']
   >>> view.move_up(('sub4',), 1)
   >>> c1.keys()
-  ['sub1', 'sub4', 'sub2', 'sub3']
+  [u'sub1', u'sub4', u'sub2', u'sub3']
   >>> view.move_top(('sub2',))
   >>> c1.keys()
-  ['sub2', 'sub1', 'sub4', 'sub3']
+  [u'sub2', u'sub1', u'sub4', u'sub3']
   >>> view.move_down(('sub2',), 2)
   >>> c1.keys()
-  ['sub1', 'sub4', 'sub2', 'sub3']
+  [u'sub1', u'sub4', u'sub2', u'sub3']
 

container/tests.py

@@ -1,12 +1,10 @@
-# $Id$
 
-import unittest
-from zope.testing.doctestunit import DocFileSuite
+import unittest, doctest
 
 
 def test_suite():
     return unittest.TestSuite((
-                DocFileSuite('README.txt'),
+                doctest.DocFileSuite('README.txt'),
             ))
 
 if __name__ == '__main__':

docgen/README.txt

@@ -48,7 +48,7 @@ Working with MHT Files
 
   >>> output = document.asString()
   >>> len(data), len(output)
-  (294996, 336140)
+  (294996, 336142)
 
   >>> outPath = os.path.join(basePath, 'out_doc.mht')
   >>> #f = open(outPath, 'wt')

docgen/tests.py

@@ -3,7 +3,6 @@ unit tests, doc tests
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 from zope.interface import implements
 
@@ -19,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

integrator/filesystem.txt

@@ -84,7 +84,7 @@ A file object has additional attributes/methods.
   >>> file.contentType
   'application/x-tar'
   >>> file.getSize()
-  432L
+  432
 
   >>> logo = sub['loops_logo.png']
   >>> logo.internalPath

integrator/tests/test_bscw.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -13,7 +11,7 @@ flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
 
 def test_suite():
     return unittest.TestSuite((
-                DocFileSuite('../bscw.txt', optionflags=flags),
+                doctest.DocFileSuite('../bscw.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

integrator/tests/test_filesystem.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -22,7 +20,7 @@ class Test(unittest.TestCase):
 def test_suite():
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('../filesystem.txt', optionflags=flags),
+                doctest.DocFileSuite('../filesystem.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

knowledge/survey/tests.py

@@ -5,7 +5,6 @@ Tests for the 'cybertools.knowledge.survey' package.
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.knowledge.knowing import Knowing
 
 
@@ -20,7 +19,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(TestSurvey),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

knowledge/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.knowledge' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.knowledge.knowing import Knowing
 
 class TestKnowledge(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(TestKnowledge),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

link/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
-import unittest
-from zope.testing.doctestunit import DocFileSuite
+import unittest, doctest
 from zope.interface.verify import verifyClass
 from zope.interface import implements
 from zope.intid.interfaces import IIntIds
@@ -44,7 +42,7 @@ class TestLink(unittest.TestCase):
 def test_suite():
     return unittest.TestSuite((
                 unittest.makeSuite(TestLink),
-                DocFileSuite('README.txt'),
+                doctest.DocFileSuite('README.txt'),
             ))
 
 if __name__ == '__main__':

meta/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.meta' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,8 +18,8 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
-        DocFileSuite('namespace.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('namespace.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

organize/tests.py

@@ -2,13 +2,10 @@
 
 """
 Tests for the 'cybertools.organize' package.
-
-$Id$
 """
 
 import unittest, doctest
 from zope import component
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.composer.schema import client, field, instance
 from cybertools.organize.party import Person
 from cybertools.organize import service
@@ -38,10 +35,10 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(TestParty),
-        DocFileSuite('README.txt', optionflags=flags),
-        DocFileSuite('formmanager.txt', optionflags=flags),
-        DocFileSuite('servicemanager.txt', optionflags=flags),
-        DocFileSuite('work.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('formmanager.txt', optionflags=flags),
+        doctest.DocFileSuite('servicemanager.txt', optionflags=flags),
+        doctest.DocFileSuite('work.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

plugin/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.plugin' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

process/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.process' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.process.definition import Process
 
 class TestProcess(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(TestProcess),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

roa/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.roa' (Resource-oriented Architecture) package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope import component
 from cybertools.roa import json
 
@@ -23,7 +20,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

scorm/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

stateful/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.stateful' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

storage/pzope/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.storage.zope' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         #unittest.makeSuite(Test),  #not used
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

storage/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.storage' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.text import pdf
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

text/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.text' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cybertools.text import pdf
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

tracking/comment/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

tracking/notify/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

tracking/tests.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import unittest, doctest
 import os
-from zope.testing.doctestunit import DocFileSuite
 
 
 testDir = os.path.join(os.path.dirname(__file__), 'testdata')
@@ -19,7 +17,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

view/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.index' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 from cybertools.view.pac import View
 
@@ -22,7 +19,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
                 unittest.makeSuite(Test),
             ))
 

xml/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cyberdev.xml' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from cStringIO import StringIO
 
 from cybertools.xml.element import elements as e, fromXML
@@ -41,7 +38,7 @@ class TestXml(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
                 unittest.makeSuite(TestXml),
             ))
 

z2/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'cybertools.z2' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 try:
     from Products.Five import BrowserView
@@ -30,7 +27,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':

zutil/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 import cybertools.zutil.jeep
 
@@ -18,7 +16,7 @@ def test_suite():
     return unittest.TestSuite((
         #unittest.makeSuite(Test),  # we don't need this
         #doctest.DocTestSuite(cybertools.zutil.property, optionflags=flags),
-        DocFileSuite('jeep.txt', optionflags=flags),
+        doctest.DocFileSuite('jeep.txt', optionflags=flags),
         doctest.DocFileSuite('rcache.txt', optionflags=flags),
     ))