Cleaning up imports, mostly in tests, some duplicates created by my merge. Pyflakes is happier now, but we do a lot of things that confuses it.

8 files changed, 22 insertions, 28 deletions

diff --git a/src/zope/interface/common/idatetime.py b/src/zope/interface/common/idatetime.py
index f726e74..c5aeba3 100644
--- a/src/zope/interface/common/idatetime.py
+++ b/src/zope/interface/common/idatetime.py
@@ -18,7 +18,7 @@ $Id$
 """
 
 from zope.interface import Interface, Attribute
-from zope.interface import classImplements, directlyProvides
+from zope.interface import classImplements
 
 from datetime import timedelta, date, datetime, time, tzinfo
 
diff --git a/src/zope/interface/common/tests/basemapping.py b/src/zope/interface/common/tests/basemapping.py
index 0cd5d11..71cfdbf 100644
--- a/src/zope/interface/common/tests/basemapping.py
+++ b/src/zope/interface/common/tests/basemapping.py
@@ -87,12 +87,6 @@ class BaseTestIEnumerableMapping(BaseTestIReadMapping):
         state = self._IEnumerableMapping__stateDict()
         test_values(self, inst, state)
 
-    def test_values(self):
-        # Return the values of the mapping object
-        inst = self._IEnumerableMapping__sample()
-        state = self._IEnumerableMapping__stateDict()
-        test_iter(self, inst, state)
-
     def test_items(self):
         # Return the items of the mapping object
         inst = self._IEnumerableMapping__sample()
diff --git a/src/zope/interface/declarations.py b/src/zope/interface/declarations.py
index 8954b3c..1248cb7 100644
--- a/src/zope/interface/declarations.py
+++ b/src/zope/interface/declarations.py
@@ -32,7 +32,6 @@ import sys
 import weakref
 from zope.interface.interface import InterfaceClass, Specification
 from zope.interface.interface import SpecificationBase
-from ro import mergeOrderings, ro
 from types import ModuleType, MethodType, FunctionType
 from zope.interface.advice import addClassAdvisor
 
diff --git a/src/zope/interface/tests/dummy.py b/src/zope/interface/tests/dummy.py
index cc1036b..74bc65e 100644
--- a/src/zope/interface/tests/dummy.py
+++ b/src/zope/interface/tests/dummy.py
@@ -17,7 +17,6 @@ $Id$
 """
 from zope.interface import moduleProvides
 from zope.interface.tests.ifoo import IFoo
-from zope.interface import moduleProvides
 
 moduleProvides(IFoo)
 
diff --git a/src/zope/interface/tests/test_adapter.py b/src/zope/interface/tests/test_adapter.py
index 9ce2c47..b037c03 100644
--- a/src/zope/interface/tests/test_adapter.py
+++ b/src/zope/interface/tests/test_adapter.py
@@ -19,7 +19,6 @@ import doctest
 import unittest
 import zope.interface
 from zope.interface.adapter import AdapterRegistry
-import zope.interface
 
 
 class IF0(zope.interface.Interface):
diff --git a/src/zope/interface/tests/test_advice.py b/src/zope/interface/tests/test_advice.py
index b0ad7f3..d86fc38 100644
--- a/src/zope/interface/tests/test_advice.py
+++ b/src/zope/interface/tests/test_advice.py
@@ -30,7 +30,8 @@ $Id$
 
 import unittest
 from unittest import TestCase, makeSuite, TestSuite
-from zope.interface.advice import *
+from zope.interface.advice import addClassAdvisor, determineMetaclass
+from zope.interface.advice import getFrameInfo
 import sys
 
 def ping(log, value):
diff --git a/src/zope/interface/tests/test_declarations.py b/src/zope/interface/tests/test_declarations.py
index 0681fe7..fb9aa5c 100644
--- a/src/zope/interface/tests/test_declarations.py
+++ b/src/zope/interface/tests/test_declarations.py
@@ -18,8 +18,9 @@ $Id$
 import doctest
 import unittest
 
-from zope.interface import *
-from zope.interface import Interface
+from zope.interface import Interface, implements
+from zope.interface import directlyProvides, providedBy
+from zope.interface import classImplements, implementedBy, implementsOnly
 
 class I1(Interface): pass
 class I2(Interface): pass
@@ -107,14 +108,14 @@ class Test(unittest.TestCase):
         self.failIf(C3.__implemented__.__class__ is tuple)
 
     def test_module(self):
-        import zope.interface.tests.m1
-        import zope.interface.tests.m2
-        directlyProvides(zope.interface.tests.m2,
-                         zope.interface.tests.m1.I1,
-                         zope.interface.tests.m1.I2,
+        from zope.interface.tests import m1, m2
+        #import zope.interface.tests.m2
+        directlyProvides(m2,
+                         m1.I1,
+                         m1.I2,
                          )
-        self.assertEqual(list(providedBy(zope.interface.tests.m1)),
-                         list(providedBy(zope.interface.tests.m2)),
+        self.assertEqual(list(providedBy(m1)),
+                         list(providedBy(m2)),
                          )
 
     def test_builtins(self):
@@ -199,6 +200,7 @@ def test_pickle_provides_specs():
 
 def test_that_we_dont_inherit_class_provides():
     """
+    >>> from zope.interface import classProvides
     >>> class X(object):
     ...     classProvides(I1)
     >>> class Y(X):
@@ -264,7 +266,7 @@ def test_classProvides_before_implements():
 
         For example::
 
-          >>> from zope.interface import Interface
+          >>> from zope.interface import Interface, classProvides
           >>> class IFooFactory(Interface):
           ...     pass
           >>> class IFoo(Interface):
@@ -332,7 +334,7 @@ def test_declaration_get():
         >>> class I11(I1):
         ...    a11 = zope.interface.Attribute('a111')
 
-        >>> decl = Declaration(I11, I2)
+        >>> decl = zope.interface.Declaration(I11, I2)
         >>> decl.get('a11') is I11.get('a11')
         True
         >>> decl.get('a12') is I1.get('a12')
@@ -347,7 +349,7 @@ def test_declaration_get():
 
     We get None even with no interfaces:
 
-        >>> decl = Declaration()
+        >>> decl = zope.interface.Declaration()
         >>> decl.get('a11')
         >>> decl.get('a11', 42)
         42
diff --git a/src/zope/interface/tests/test_odd_declarations.py b/src/zope/interface/tests/test_odd_declarations.py
index 9780638..973bd5e 100644
--- a/src/zope/interface/tests/test_odd_declarations.py
+++ b/src/zope/interface/tests/test_odd_declarations.py
@@ -22,7 +22,7 @@ import doctest
 import unittest
 
 from zope.interface.tests import odd
-from zope.interface import Interface, implements, implementsOnly
+from zope.interface import Interface, implements, classProvides
 from zope.interface import directlyProvides, providedBy, directlyProvidedBy
 from zope.interface import classImplements, classImplementsOnly, implementedBy
 
@@ -114,13 +114,13 @@ class Test(unittest.TestCase):
 
     def test_classImplements(self):
         class A(Odd):
-          implements(I3)
+            implements(I3)
 
         class B(Odd):
-          implements(I4)
+            implements(I4)
 
         class C(A, B):
-          pass
+            pass
         classImplements(C, I1, I2)
         self.assertEqual([i.getName() for i in implementedBy(C)],
                          ['I1', 'I2', 'I3', 'I4'])
@@ -136,7 +136,7 @@ class Test(unittest.TestCase):
             implements(I4)
 
         class C(A, B):
-          pass
+            pass
         classImplementsOnly(C, I1, I2)
         self.assertEqual([i.__name__ for i in implementedBy(C)],
                          ['I1', 'I2'])