[Checkins] SVN: zope.interface/trunk/s 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.
Lennart Regebro
regebro at gmail.com
Sun Apr 11 06:59:30 EDT 2010
Log message for revision 110736:
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.
Changed:
U zope.interface/trunk/setup.py
U zope.interface/trunk/src/zope/interface/common/idatetime.py
U zope.interface/trunk/src/zope/interface/common/tests/basemapping.py
U zope.interface/trunk/src/zope/interface/declarations.py
U zope.interface/trunk/src/zope/interface/tests/dummy.py
U zope.interface/trunk/src/zope/interface/tests/test_adapter.py
U zope.interface/trunk/src/zope/interface/tests/test_advice.py
U zope.interface/trunk/src/zope/interface/tests/test_declarations.py
U zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py
-=-
Modified: zope.interface/trunk/setup.py
===================================================================
--- zope.interface/trunk/setup.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/setup.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -23,9 +23,6 @@
import os, sys
-from distutils.errors import CCompilerError, DistutilsExecError, \
- DistutilsPlatformError
-
try:
from setuptools import setup, Extension, Feature
except ImportError:
Modified: zope.interface/trunk/src/zope/interface/common/idatetime.py
===================================================================
--- zope.interface/trunk/src/zope/interface/common/idatetime.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/common/idatetime.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -18,7 +18,7 @@
"""
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
Modified: zope.interface/trunk/src/zope/interface/common/tests/basemapping.py
===================================================================
--- zope.interface/trunk/src/zope/interface/common/tests/basemapping.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/common/tests/basemapping.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -87,12 +87,6 @@
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()
Modified: zope.interface/trunk/src/zope/interface/declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/declarations.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/declarations.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -32,7 +32,6 @@
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
Modified: zope.interface/trunk/src/zope/interface/tests/dummy.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/dummy.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/tests/dummy.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -17,7 +17,6 @@
"""
from zope.interface import moduleProvides
from zope.interface.tests.ifoo import IFoo
-from zope.interface import moduleProvides
moduleProvides(IFoo)
Modified: zope.interface/trunk/src/zope/interface/tests/test_adapter.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_adapter.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/tests/test_adapter.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -19,7 +19,6 @@
import unittest
import zope.interface
from zope.interface.adapter import AdapterRegistry
-import zope.interface
class IF0(zope.interface.Interface):
Modified: zope.interface/trunk/src/zope/interface/tests/test_advice.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_advice.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/tests/test_advice.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -30,7 +30,8 @@
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):
Modified: zope.interface/trunk/src/zope/interface/tests/test_declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_declarations.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/tests/test_declarations.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -18,8 +18,9 @@
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 @@
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_that_we_dont_inherit_class_provides():
"""
+ >>> from zope.interface import classProvides
>>> class X(object):
... classProvides(I1)
>>> class Y(X):
@@ -264,7 +266,7 @@
For example::
- >>> from zope.interface import Interface
+ >>> from zope.interface import Interface, classProvides
>>> class IFooFactory(Interface):
... pass
>>> class IFoo(Interface):
@@ -332,7 +334,7 @@
>>> 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 @@
We get None even with no interfaces:
- >>> decl = Declaration()
+ >>> decl = zope.interface.Declaration()
>>> decl.get('a11')
>>> decl.get('a11', 42)
42
Modified: zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py
===================================================================
--- zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py 2010-04-11 09:54:36 UTC (rev 110735)
+++ zope.interface/trunk/src/zope/interface/tests/test_odd_declarations.py 2010-04-11 10:59:30 UTC (rev 110736)
@@ -22,7 +22,7 @@
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 @@
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 @@
implements(I4)
class C(A, B):
- pass
+ pass
classImplementsOnly(C, I1, I2)
self.assertEqual([i.__name__ for i in implementedBy(C)],
['I1', 'I2'])
More information about the checkins
mailing list