fix tests/doctests according to current ZTK and BlueBream versions

README.txt

@@ -632,7 +632,7 @@ Let's add some more nodes and reorder them:
   >>> m114 = Node()
   >>> m11['m114'] = m114
   >>> m11.keys()
-  ['m111', 'm112', 'm113', 'm114']
+  [u'm111', u'm112', u'm113', u'm114']
 
 A special management view provides methods for moving objects down, up,
 to the bottom, and to the top.
@@ -641,10 +641,10 @@ to the bottom, and to the top.
   >>> view = OrderedContainerView(m11, TestRequest())
   >>> view.move_bottom(('m113',))
   >>> m11.keys()
-  ['m111', 'm112', 'm114', 'm113']
+  [u'm111', u'm112', u'm114', u'm113']
   >>> view.move_up(('m114',), 1)
   >>> m11.keys()
-  ['m111', 'm114', 'm112', 'm113']
+  [u'm111', u'm114', u'm112', u'm113']
 
 
 Breadcrumbs

browser/lobo/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 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__':

classifier/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,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__':

compound/tests.py

@@ -2,7 +2,6 @@
 # Package loops.compound
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 
@@ -18,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__':

config/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -16,7 +14,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__':

constraint/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
 
@@ -17,7 +15,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__':

expert/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 try:
     from loops.expert import query
@@ -23,8 +21,8 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
-                DocFileSuite('search.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('search.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':

external/README.txt

@@ -151,8 +151,8 @@ Writing object information to the external storage
   child(u'projects', u'customer', u'standard')...
   resource(u'doc04.txt', u'Document 4', u'textdocument', contentType='text/restructured')...
   resourceRelation(u'myquery', u'doc04.txt', u'standard')
-  node('home', u'Home', '', u'menu')
-  node('myquery', u'My Query', 'home', u'page', target=u'concepts/myquery')...
+  node(u'home', u'Home', '', u'menu')
+  node(u'myquery', u'My Query', u'home', u'page', target=u'concepts/myquery')...
 
 Writing sub-elements
 -------------------

external/tests.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import unittest, doctest
 import os
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -20,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__':

i18n/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
 
@@ -17,7 +15,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/content/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,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/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,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__':

knowledge/tests.py

@@ -5,7 +5,6 @@ import unittest, doctest
 from zope.app.testing import ztapi
 from zope import component
 from zope.interface.verify import verifyClass
-from zope.testing.doctestunit import DocFileSuite
 
 from loops.knowledge.qualification.base import Competence
 from loops.knowledge.survey.base import Questionnaire, Question, FeedbackItem
@@ -40,7 +39,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__':

layout/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 from zope import component
 from loops.layout.base import NodeLayoutInstance, SubnodesLayoutInstance
@@ -24,7 +22,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__':

media/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'loops.media' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -22,7 +19,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__':

organize/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__':

organize/job/tests.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-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__':

organize/personal/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__':

organize/process/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
 from loops.organize.party import Person
@@ -17,7 +15,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__':

organize/stateful/tests.py

@@ -2,12 +2,9 @@
 
 """
 Tests for the 'loops.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__':

organize/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 from zope import component
@@ -85,7 +83,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__':

organize/tracking/tests.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-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__':

organize/work/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__':

rest/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__':

system/sync/tests.py

@@ -1,8 +1,6 @@
-# $Id$
 
 import unittest, doctest
 import os
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -20,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__':

system/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,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__':

versioning/tests.py

@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 from loops.versioning import versionable
 
@@ -16,7 +14,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__':

xmlrpc/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__':