remove deprecated import from zope.testing

This commit is contained in:
Helmut Merz 2016-12-26 10:37:00 +01:00
parent 3115b4f19e
commit a91e1b0c4c
26 changed files with 26 additions and 82 deletions

View file

@ -1,9 +1,6 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
#from loops.versioning import versionable
class Test(unittest.TestCase): class Test(unittest.TestCase):
"Basic tests for the classifier sub-package." "Basic tests for the classifier sub-package."
@ -16,7 +13,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -2,7 +2,6 @@
# Package loops.compound # Package loops.compound
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.app.testing import ztapi from zope.app.testing import ztapi
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
@ -18,7 +17,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

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

View file

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

View file

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

4
external/tests.py vendored
View file

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

View file

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

View file

@ -1,9 +1,6 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
#from loops.versioning import versionable
class Test(unittest.TestCase): class Test(unittest.TestCase):
"Basic tests for the loops.integrator.content package." "Basic tests for the loops.integrator.content package."
@ -16,7 +13,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -1,9 +1,6 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
#from loops.versioning import versionable
class Test(unittest.TestCase): class Test(unittest.TestCase):
"Basic tests for the integrator sub-package." "Basic tests for the integrator sub-package."
@ -16,7 +13,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -1,11 +1,9 @@
# tests.py - loops.knowledge package
import os import os
import unittest, doctest import unittest, doctest
from zope.app.testing import ztapi from zope.app.testing import ztapi
from zope import component from zope import component
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
from zope.testing.doctestunit import DocFileSuite
from loops.expert.report import IReport, Report from loops.expert.report import IReport, Report
from loops.knowledge.qualification.base import Competence from loops.knowledge.qualification.base import Competence
@ -42,7 +40,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -1,7 +1,5 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope import component from zope import component
from loops.layout.base import NodeLayoutInstance, SubnodesLayoutInstance from loops.layout.base import NodeLayoutInstance, SubnodesLayoutInstance
@ -24,7 +22,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -2,12 +2,9 @@
""" """
Tests for the 'loops.media' package. Tests for the 'loops.media' package.
$Id$
""" """
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
@ -22,7 +19,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,9 +1,6 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.testing.doctestunit import DocFileSuite
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass
#from loops.versioning import versionable
class Test(unittest.TestCase): class Test(unittest.TestCase):
"Basic tests for the system sub-package." "Basic tests for the system sub-package."
@ -16,7 +13,7 @@ def test_suite():
flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
return unittest.TestSuite(( return unittest.TestSuite((
unittest.makeSuite(Test), unittest.makeSuite(Test),
DocFileSuite('README.txt', optionflags=flags), doctest.DocFileSuite('README.txt', optionflags=flags),
)) ))
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -1,4 +1,3 @@
# $Id$
import unittest, doctest import unittest, doctest
from zope.interface.verify import verifyClass from zope.interface.verify import verifyClass

View file

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

View file

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