From 9205e8592e0c9b118374ecaad835847923ce798b Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 26 Dec 2016 10:42:27 +0100 Subject: [PATCH] remove deprecated import from zope.testing --- integrator/filesystem.txt | 2 +- integrator/tests/test_bscw.py | 4 +--- integrator/tests/test_filesystem.py | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/integrator/filesystem.txt b/integrator/filesystem.txt index 401ae86..aa05f6a 100644 --- a/integrator/filesystem.txt +++ b/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 diff --git a/integrator/tests/test_bscw.py b/integrator/tests/test_bscw.py index 41bd51d..7ccdf41 100755 --- a/integrator/tests/test_bscw.py +++ b/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__': diff --git a/integrator/tests/test_filesystem.py b/integrator/tests/test_filesystem.py index 8a2e6d0..23c7f03 100755 --- a/integrator/tests/test_filesystem.py +++ b/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__':