r13575 - in archetypes.markerfield/trunk: . archetypes archetypes/markerfield archetypes/markerfield/tests

Author: hannosch
Date: Thu Apr  7 09:46:33 2011
New Revision: 13575

Modified:
   archetypes.markerfield/trunk/CHANGES.txt
   archetypes.markerfield/trunk/archetypes/__init__.py
   archetypes.markerfield/trunk/archetypes/markerfield/__init__.py
   archetypes.markerfield/trunk/archetypes/markerfield/field.py
   archetypes.markerfield/trunk/archetypes/markerfield/tests/__init__.py
   archetypes.markerfield/trunk/archetypes/markerfield/tests/testUtils.py
   archetypes.markerfield/trunk/archetypes/markerfield/utils.py
Log:
PEP8 cleanup


Modified: archetypes.markerfield/trunk/CHANGES.txt
==============================================================================
--- archetypes.markerfield/trunk/CHANGES.txt	(original)
+++ archetypes.markerfield/trunk/CHANGES.txt	Thu Apr  7 09:46:33 2011
@@ -4,10 +4,11 @@
 1.1 - Unreleased
 ----------------
 
-
+- PEP8 cleanup.
+  [hannosch]
 
 1.0 - 2008-11-06
 ----------------
 
-* Initial release
+- Initial release
   [wichert]

Modified: archetypes.markerfield/trunk/archetypes/__init__.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/__init__.py	(original)
+++ archetypes.markerfield/trunk/archetypes/__init__.py	Thu Apr  7 09:46:33 2011
@@ -1,6 +1 @@
-# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    from pkgutil import extend_path
-    __path__ = extend_path(__path__, __name__)
+__import__('pkg_resources').declare_namespace(__name__)

Modified: archetypes.markerfield/trunk/archetypes/markerfield/__init__.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/markerfield/__init__.py	(original)
+++ archetypes.markerfield/trunk/archetypes/markerfield/__init__.py	Thu Apr  7 09:46:33 2011
@@ -1,2 +1,3 @@
 from archetypes.markerfield.field import InterfaceMarkerField
 
+__all__ = (InterfaceMarkerField, )

Modified: archetypes.markerfield/trunk/archetypes/markerfield/field.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/markerfield/field.py	(original)
+++ archetypes.markerfield/trunk/archetypes/markerfield/field.py	Thu Apr  7 09:46:33 2011
@@ -1,7 +1,8 @@
+from Products.Archetypes.atapi import BooleanField
+
 from archetypes.schemaextender.field import ExtensionField
 from archetypes.markerfield.utils import addMarkerInterface
 from archetypes.markerfield.utils import removeMarkerInterface
-from Products.Archetypes.atapi import BooleanField
 
 
 class InterfaceMarkerField(ExtensionField, BooleanField):
@@ -18,17 +19,13 @@
         for iface in self.interfaces:
             if not iface.providedBy(instance):
                 return False
-        else:
-            return True
-
+        return True
 
     def getRaw(self, instance, **kwargs):
         return self.get(instance)
 
-
     def set(self, instance, value, **kwargs):
         if value:
             addMarkerInterface(instance, *self.interfaces)
         else:
             removeMarkerInterface(instance, *self.interfaces)
-

Modified: archetypes.markerfield/trunk/archetypes/markerfield/tests/__init__.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/markerfield/tests/__init__.py	(original)
+++ archetypes.markerfield/trunk/archetypes/markerfield/tests/__init__.py	Thu Apr  7 09:46:33 2011
@@ -1,2 +0,0 @@
-
-

Modified: archetypes.markerfield/trunk/archetypes/markerfield/tests/testUtils.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/markerfield/tests/testUtils.py	(original)
+++ archetypes.markerfield/trunk/archetypes/markerfield/tests/testUtils.py	Thu Apr  7 09:46:33 2011
@@ -1,71 +1,73 @@
-from zope.interface import Interface
-from zope.interface import implements
-from zope.interface import providedBy
 from unittest import TestCase
 from unittest import makeSuite
 from unittest import TestSuite
+
+from zope.interface import Interface
+from zope.interface import implements
+from zope.interface import providedBy
+
 from archetypes.markerfield.utils import addMarkerInterface
 from archetypes.markerfield.utils import removeMarkerInterface
 
+
 class MarkerInterface(Interface):
     pass
 
+
 class SecondMarkerInterface(Interface):
     pass
 
+
 class BaseInterface(Interface):
     pass
 
+
 class Mock(object):
     pass
 
+
 class MockWithInterface(object):
     implements(BaseInterface)
-    
+
 
 class InterfaceTests(TestCase):
+
     def ifaces(self, obj):
         return [i.getName() for i in providedBy(obj)]
 
-
     def testAddNothing(self):
         obj=Mock()
         addMarkerInterface(obj)
         self.assertEqual(self.ifaces(obj), [])
 
-
     def testAddSingleInterface(self):
         obj=Mock()
         addMarkerInterface(obj, MarkerInterface)
         self.assertEqual(self.ifaces(obj), ["MarkerInterface"])
 
-
     def testAddMultipleInterfaces(self):
         obj=Mock()
         addMarkerInterface(obj, MarkerInterface, SecondMarkerInterface)
         self.assertEqual(self.ifaces(obj),
-                         ["MarkerInterface", "SecondMarkerInterface"])
-
+            ["MarkerInterface", "SecondMarkerInterface"])
 
     def testAddAdditionalInterface(self):
         obj=MockWithInterface()
         addMarkerInterface(obj, MarkerInterface)
-        self.assertEqual(self.ifaces(obj), ["MarkerInterface", "BaseInterface"])
-
+        self.assertEqual(self.ifaces(obj),
+            ["MarkerInterface", "BaseInterface"])
 
     def testRemoveNonPresentInterface(self):
         obj=Mock()
         removeMarkerInterface(obj, MarkerInterface)
         self.assertEqual(self.ifaces(obj), [])
 
-
     def testAddAndRemoveSingleInterface(self):
         obj=Mock()
         addMarkerInterface(obj, MarkerInterface)
         removeMarkerInterface(obj, MarkerInterface)
         self.assertEqual(self.ifaces(obj), [])
 
-
     def testAddTwoInterfacesAndRemoveOne(self):
         obj=Mock()
         addMarkerInterface(obj, MarkerInterface, SecondMarkerInterface)
@@ -73,8 +75,6 @@
         self.assertEqual(self.ifaces(obj), ["SecondMarkerInterface"])
 
 
-
-
 def test_suite():
     suite=TestSuite()
     suite.addTest(makeSuite(InterfaceTests))

Modified: archetypes.markerfield/trunk/archetypes/markerfield/utils.py
==============================================================================
--- archetypes.markerfield/trunk/archetypes/markerfield/utils.py	(original)
+++ archetypes.markerfield/trunk/archetypes/markerfield/utils.py	Thu Apr  7 09:46:33 2011
@@ -12,4 +12,3 @@
     for iface in ifaces:
         if iface.providedBy(obj):
             noLongerProvides(obj, iface)
-

------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev