[Checkins] SVN: zope.interface/trunk/src/zope/interface/interface.py Cleanups: make pyflakes happy.

Tres Seaver tseaver at palladion.com
Wed Dec 16 20:40:22 EST 2009


Log message for revision 106686:
  Cleanups:  make pyflakes happy.

Changed:
  U   zope.interface/trunk/src/zope/interface/interface.py

-=-
Modified: zope.interface/trunk/src/zope/interface/interface.py
===================================================================
--- zope.interface/trunk/src/zope/interface/interface.py	2009-12-17 01:30:54 UTC (rev 106685)
+++ zope.interface/trunk/src/zope/interface/interface.py	2009-12-17 01:40:22 UTC (rev 106686)
@@ -12,18 +12,15 @@
 #
 ##############################################################################
 """Interface object implementation
-
-$Id$
 """
-
 from __future__ import generators
 
 import sys
-import warnings
+from types import FunctionType
 import weakref
-from types import FunctionType
-from ro import ro
+
 from zope.interface.exceptions import Invalid
+from zope.interface.ro import ro
 
 
 CO_VARARGS = 4
@@ -163,6 +160,10 @@
     __call__ = isOrExtends
 
 SpecificationBase = SpecificationBasePy
+try:
+    from _zope_interface_coptimizations import SpecificationBase
+except ImportError:
+    pass
 
 _marker = object()
 class InterfaceBasePy(object):
@@ -197,19 +198,22 @@
             adapter = hook(self, obj)
             if adapter is not None:
                 return adapter
+
     
 InterfaceBase = InterfaceBasePy
+try:
+    from _zope_interface_coptimizations import InterfaceBase
+except ImportError:
+    pass
 
+
 adapter_hooks = []
-
 try:
-    import _zope_interface_coptimizations
+    from _zope_interface_coptimizations import adapter_hooks
 except ImportError:
     pass
-else:
-    from _zope_interface_coptimizations import SpecificationBase
-    from _zope_interface_coptimizations import InterfaceBase, adapter_hooks
 
+
 class Specification(SpecificationBase):
     """Specifications
 
@@ -801,11 +805,14 @@
     from zope.interface.interfaces import IMethod
     classImplements(Method, IMethod)
 
-    from zope.interface.interfaces import IInterface, ISpecification
+    from zope.interface.interfaces import IInterface
     classImplements(InterfaceClass, IInterface)
+
+    from zope.interface.interfaces import ISpecification
     classImplements(Specification, ISpecification)
 
 # We import this here to deal with module dependencies.
-from zope.interface.declarations import providedBy, implementedBy
+from zope.interface.declarations import implementedBy
+from zope.interface.declarations import providedBy
 from zope.interface.exceptions import InvalidInterface
 from zope.interface.exceptions import BrokenImplementation



More information about the checkins mailing list