Intermediate changes

commit_hash:d61540abee23f6613ae4792d93d214c70f277973

2 files changed, 6 insertions, 3 deletions

diff --git a/contrib/python/zope.interface/py3/zope/interface/tests/test_declarations.py b/contrib/python/zope.interface/py3/zope/interface/tests/test_declarations.py
index c684d7c61e2..2abf0af95af 100644
--- a/contrib/python/zope.interface/py3/zope/interface/tests/test_declarations.py
+++ b/contrib/python/zope.interface/py3/zope/interface/tests/test_declarations.py
@@ -26,6 +26,7 @@ from __tests__.tests.test_interface import \
 # pylint:disable=inherit-non-class,too-many-lines,protected-access
 # pylint:disable=blacklisted-name,attribute-defined-outside-init
 
+IBar = InterfaceClass('IBar')
 IFoo = InterfaceClass('IFoo')
 
 
@@ -1373,10 +1374,9 @@ class TestProvidesClassRepr(unittest.TestCase):
         from zope.interface.declarations import alsoProvides
         from zope.interface.declarations import directlyProvides
         from __tests__.tests import dummy
+        from __tests__.tests.test_declarations import IBar
         from __tests__.tests.test_declarations import IFoo
 
-        IBar = InterfaceClass('IBar')
-
         orig_provides = dummy.__provides__  # pylint:disable=no-member
         del dummy.__provides__  # pylint:disable=no-member
         self.addCleanup(setattr, dummy, '__provides__', orig_provides)
@@ -1401,7 +1401,7 @@ class TestProvidesClassRepr(unittest.TestCase):
 
         # If we make this module also provide IFoo and IBar, then the repr
         # lists both names.
-        my_module = sys.modules[__name__]
+        from __tests__.tests import test_declarations as my_module
         assert not hasattr(my_module, '__provides__')
 
         directlyProvides(my_module, IFoo, IBar)
diff --git a/contrib/python/zope.interface/py3/zope/interface/tests/test_ro.py b/contrib/python/zope.interface/py3/zope/interface/tests/test_ro.py
index aeb801a6605..c2978ac80dd 100644
--- a/contrib/python/zope.interface/py3/zope/interface/tests/test_ro.py
+++ b/contrib/python/zope.interface/py3/zope/interface/tests/test_ro.py
@@ -12,9 +12,12 @@
 #
 ##############################################################################
 """Resolution ordering utility tests"""
+import doctest
+import re
 import unittest
 
 
+
 # pylint:disable=blacklisted-name
 # pylint:disable=protected-access
 # pylint:disable=attribute-defined-outside-init