Merge pull request #1 from plone/pep8cleanup

Some pep8 cleanup

CHANGES.txt

@@ -7,6 +7,10 @@ Changelog
 - Modernize some imports.
   [hannosch]
 
+- Minor pep8 cleanup, changed has_key() synatax to 'in' syntax in
+  a few areas
+  [pbdiode]
+
 0.9.14 (2012-04-15)
 -------------------
 

Products/PloneTestCase/PloneTestCase.py

@@ -150,7 +150,7 @@ def addProfile(self, name):
         self.loginAsPortalOwner()
         try:
             installed = getattr(self.portal, '_installed_profiles', {})
-            if not installed.has_key(name):
+            if not name in installed:
                 setup = self.portal.portal_setup
                 profile_id = 'profile-%s' % (name,)
                 if PLONE30:
@@ -185,4 +185,3 @@ class FunctionalTestCase(Functional, PloneTestCase):
     if not Z3INTERFACES:
         __implements__ = (Functional.__implements__,
                           PloneTestCase.__implements__)
-

Products/PloneTestCase/five.py

@@ -11,7 +11,8 @@
         from zope.app.testing.placelesssetup import tearDown as _cleanUp
     except ImportError:
         # Zope < 2.8
-        def _cleanUp(): pass
+        def _cleanUp():
+            pass
 
 
 def cleanUp():
@@ -74,4 +75,3 @@ def wrapped_func(*args, **kw):
         cleanUp()
         return value
     return wrapped_func
-

Products/PloneTestCase/framework.py

@@ -52,7 +52,7 @@
 
 # Find and import the Testing package
 #
-if not sys.modules.has_key('Testing'):
+if not 'Testing' in sys.modules:
     p0 = sys.path[0]
     if p0 and __name__ == '__main__':
         os.chdir(p0)
@@ -64,13 +64,14 @@
             zope_home = os.path.dirname(os.path.dirname(p))
             sys.path[:1] = [p0, p, zope_home]
             break
-        p, d = s and ('','') or os.path.split(p)
+        p, d = s and ('', '') or os.path.split(p)
     else:
         print 'Unable to locate Testing package.',
         print 'You might need to set SOFTWARE_HOME.'
         sys.exit(1)
 
-import Testing, unittest
+import Testing
+import unittest
 execfile(os.path.join(os.path.dirname(Testing.__file__), 'common.py'))
 
 # Include ZopeTestCase support
@@ -104,4 +105,3 @@
 print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set')
 print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set')
 sys.stdout.flush()
-

Products/PloneTestCase/interfaces.py

@@ -33,4 +33,3 @@ def addProduct(name):
            This is an alternative to passing the 'products'
            argument to 'setupPloneSite'.
         '''
-

Products/PloneTestCase/layer.py

@@ -65,4 +65,3 @@ def deferred_func(*args, **kw):
     pass
 else:
     ZCML.__bases__ = (ZopeLite,)
-

Products/PloneTestCase/ptc.py

@@ -41,4 +41,3 @@
 
 from Products.PloneTestCase.PloneTestCase import PloneTestCase
 from Products.PloneTestCase.PloneTestCase import FunctionalTestCase
-

Products/PloneTestCase/runalltests.py

@@ -8,7 +8,9 @@
 #   python /path/to/Zope/utilities/testrunner.py -qa
 #
 
-import os, sys
+import os
+import sys
+
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
@@ -26,4 +28,3 @@
 
 if __name__ == '__main__':
     TestRunner().run(suite)
-

Products/PloneTestCase/setup.py

@@ -14,6 +14,7 @@
 from version import PLONE42
 from version import PLONE50
 
+
 def install_products():
     ZopeTestCase.installProduct('CMFCore', quiet=1)
     ZopeTestCase.installProduct('CMFDefault', quiet=1)
@@ -150,6 +151,7 @@ def install_products_50():
 if PLONE50:
     default_extension_profiles = ('Products.ATContentTypes:default', )
 
+
 def setupPloneSite(id=portal_name,
                    policy=default_policy,
                    products=default_products,
@@ -201,7 +203,8 @@ def run(self):
             uf = self.app.acl_users
             if uf.getUserById(portal_owner) is None:
                 # Add portal owner
-                uf.userFolderAddUser(portal_owner, default_password, ['Manager'], [])
+                uf.userFolderAddUser(portal_owner, default_password,
+                                     ['Manager'], [])
             if not hasattr(aq_base(self.app), self.id):
                 # Add site
                 self._login(uf, portal_owner)
@@ -260,9 +263,10 @@ def _setupPloneSite_with_portalgenerator(self):
             self._print('Adding Plone Site ... ')
         # Add Plone site
         factory = self.app.manage_addProduct['CMFPlone']
-        factory.manage_addSite(self.id, create_userfolder=1, custom_policy=self.policy)
+        factory.manage_addSite(self.id, create_userfolder=1,
+                               custom_policy=self.policy)
         self._commit()
-        self._print('done (%.3fs)\n' % (time()-start,))
+        self._print('done (%.3fs)\n' % (time() - start,))
 
     def _setupRegistries(self):
         '''Installs persistent registries.'''
@@ -277,7 +281,7 @@ def _setupProfiles(self):
         setup = getattr(portal, 'portal_setup', None)
         if setup is not None:
             for profile in self.extension_profiles:
-                if not portal._installed_profiles.has_key(profile):
+                if not profile in portal._installed_profiles:
                     start = time()
                     self._print('Adding %s ... ' % (profile,))
                     profile_id = 'profile-%s' % (profile,)
@@ -292,7 +296,7 @@ def _setupProfiles(self):
                             setup.setImportContext(saved)
                     portal._installed_profiles[profile] = 1
                     self._commit()
-                    self._print('done (%.3fs)\n' % (time()-start,))
+                    self._print('done (%.3fs)\n' % (time() - start,))
 
     def _setupProducts(self):
         '''Quickinstalls products into the site.'''
@@ -309,7 +313,7 @@ def _setupProducts(self):
                     self._print('Adding %s ... ' % (product,))
                     qi.installProduct(product)
                     self._commit()
-                    self._print('done (%.3fs)\n' % (time()-start,))
+                    self._print('done (%.3fs)\n' % (time() - start,))
                 else:
                     self._print('Adding %s ... NOT INSTALLABLE\n' % (product,))
 
@@ -449,7 +453,7 @@ def _createHomeFolder(portal, member_id, take_ownership=1):
     if take_ownership:
         user = portal.acl_users.getUserById(member_id)
         if user is None:
-            raise ValueError, 'Member %s does not exist' % member_id
+            raise ValueError('Member %s does not exist' % member_id)
         if not hasattr(user, 'aq_base'):
             user = user.__of__(portal.acl_users)
         # Take ownership of home folder
@@ -473,9 +477,11 @@ def __init__(self, text):
         self.text = text
     from Products.CMFCore.Expression import Expression
     Expression.__init__ = __init__
+
     # Don't clone actions but convert to list only
     def _cloneActions(self):
         return list(self._actions)
+
     from Products.CMFCore.ActionProviderBase import ActionProviderBase
     ActionProviderBase._cloneActions = _cloneActions
     # The site creation code is not needed anymore in Plone >= 2.5
@@ -489,20 +495,25 @@ def setupDefaultSkins(self, p):
             ps.addSkinSelection('Basic', 'custom')
         from Products.CMFPlone.Portal import PloneGenerator
         PloneGenerator.setupDefaultSkins = setupDefaultSkins
+
         # Don't setup default Members folder
         def setupMembersFolder(self, p):
             pass
         PloneGenerator.setupMembersFolder = setupMembersFolder
+
         # Don't setup Plone content (besides Members folder)
         def setupPortalContent(self, p):
-            _createObjectByType('Large Plone Folder', p, id='Members', title='Members')
+            _createObjectByType('Large Plone Folder', p, id='Members',
+                                title='Members')
             if not PLONE21:
                 p.Members.unindexObject()
         PloneGenerator.setupPortalContent = setupPortalContent
+
     # Don't populate type fields in the ConstrainTypesMixin schema
     if PLONE21:
         def _ct_defaultAddableTypeIds(self):
             return []
-        from Products.ATContentTypes.lib.constraintypes import ConstrainTypesMixin
-        ConstrainTypesMixin._ct_defaultAddableTypeIds = _ct_defaultAddableTypeIds
-
+        from Products.ATContentTypes.lib.constraintypes \
+            import ConstrainTypesMixin
+        ConstrainTypesMixin._ct_defaultAddableTypeIds = \
+            _ct_defaultAddableTypeIds

Products/PloneTestCase/testDocument.py

@@ -2,7 +2,9 @@
 # Tests a Plone Document
 #
 
-import os, sys
+import os
+import sys
+
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
@@ -41,55 +43,76 @@ def testDeleteDocument(self):
 
     def testSubmitDocument(self):
         self.workflow.doActionFor(self.folder.doc, 'submit')
-        self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'pending')
-        self.assertEqual(len(self.catalog(getId='doc', review_state='pending')), 1)
+        self.assertEqual(
+            self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+            'pending')
+        self.assertEqual(
+            len(self.catalog(getId='doc', review_state='pending')), 1)
 
     def testAcceptDocument(self):
         self.workflow.doActionFor(self.folder.doc, 'submit')
         self.setRoles(['Reviewer'])
         self.workflow.doActionFor(self.folder.doc, 'publish')
-        self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'published')
-        self.assertEqual(len(self.catalog(getId='doc', review_state='published')), 1)
+        self.assertEqual(
+            self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+            'published')
+        self.assertEqual(
+            len(self.catalog(getId='doc', review_state='published')), 1)
 
     def testPublishDocument(self):
         self.setRoles(['Reviewer'])
         self.workflow.doActionFor(self.folder.doc, 'publish')
-        self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'published')
-        self.assertEqual(len(self.catalog(getId='doc', review_state='published')), 1)
+        self.assertEqual(
+            self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+            'published')
+        self.assertEqual(
+            len(self.catalog(getId='doc', review_state='published')), 1)
 
     if PloneTestCase.PLONE30:
 
         def testRejectDocument(self):
             self.workflow.doActionFor(self.folder.doc, 'submit')
             self.setRoles(['Reviewer'])
             self.workflow.doActionFor(self.folder.doc, 'reject')
-            self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'private')
-            self.assertEqual(len(self.catalog(getId='doc', review_state='private')), 1)
+            self.assertEqual(
+                self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+                'private')
+            self.assertEqual(
+                len(self.catalog(getId='doc', review_state='private')), 1)
 
         def testRetractDocument(self):
             self.setRoles(['Reviewer'])
             self.workflow.doActionFor(self.folder.doc, 'publish')
             self.setRoles(['Member'])
             self.workflow.doActionFor(self.folder.doc, 'retract')
-            self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'private')
-            self.assertEqual(len(self.catalog(getId='doc', review_state='private')), 1)
+            self.assertEqual(
+                self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+                'private')
+            self.assertEqual(
+                len(self.catalog(getId='doc', review_state='private')), 1)
 
     else:
 
         def testRejectDocument(self):
             self.workflow.doActionFor(self.folder.doc, 'submit')
             self.setRoles(['Reviewer'])
             self.workflow.doActionFor(self.folder.doc, 'reject')
-            self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'visible')
-            self.assertEqual(len(self.catalog(getId='doc', review_state='visible')), 1)
+            self.assertEqual(
+                self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+                'visible')
+            self.assertEqual(
+                len(self.catalog(getId='doc', review_state='visible')), 1)
 
         def testRetractDocument(self):
             self.setRoles(['Reviewer'])
             self.workflow.doActionFor(self.folder.doc, 'publish')
             self.setRoles(['Member'])
             self.workflow.doActionFor(self.folder.doc, 'retract')
-            self.assertEqual(self.workflow.getInfoFor(self.folder.doc, 'review_state'), 'visible')
-            self.assertEqual(len(self.catalog(getId='doc', review_state='visible')), 1)
+            self.assertEqual(
+                self.workflow.getInfoFor(self.folder.doc, 'review_state'),
+                'visible')
+            self.assertEqual(
+                len(self.catalog(getId='doc', review_state='visible')), 1)
 
 
 def test_suite():
@@ -100,4 +123,3 @@ def test_suite():
 
 if __name__ == '__main__':
     framework()
-

Products/PloneTestCase/testInterfaces.py

@@ -2,7 +2,8 @@
 # Interface tests
 #
 
-import os, sys
+import os
+import sys
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
 
@@ -26,15 +27,18 @@ def _portal(self):
         return None
 
     def testIPortalTestCase(self):
-        self.failUnless(verifyClass(IPortalTestCase, PloneTestCase.PloneTestCase))
+        self.failUnless(verifyClass(IPortalTestCase,
+                                    PloneTestCase.PloneTestCase))
         self.failUnless(verifyObject(IPortalTestCase, self))
 
     def testIPloneTestCase(self):
-        self.failUnless(verifyClass(IPloneTestCase, PloneTestCase.PloneTestCase))
+        self.failUnless(verifyClass(IPloneTestCase,
+                                    PloneTestCase.PloneTestCase))
         self.failUnless(verifyObject(IPloneTestCase, self))
 
     def testIPloneSecurity(self):
-        self.failUnless(verifyClass(IPloneSecurity, PloneTestCase.PloneTestCase))
+        self.failUnless(verifyClass(IPloneSecurity,
+                                    PloneTestCase.PloneTestCase))
         self.failUnless(verifyObject(IPloneSecurity, self))
 
 
@@ -46,19 +50,23 @@ def _portal(self):
         return None
 
     def testIFunctional(self):
-        self.failUnless(verifyClass(IFunctional, PloneTestCase.FunctionalTestCase))
+        self.failUnless(verifyClass(IFunctional,
+                                    PloneTestCase.FunctionalTestCase))
         self.failUnless(verifyObject(IFunctional, self))
 
     def testIPortalTestCase(self):
-        self.failUnless(verifyClass(IPortalTestCase, PloneTestCase.FunctionalTestCase))
+        self.failUnless(verifyClass(IPortalTestCase,
+                                    PloneTestCase.FunctionalTestCase))
         self.failUnless(verifyObject(IPortalTestCase, self))
 
     def testIPloneTestCase(self):
-        self.failUnless(verifyClass(IPloneTestCase, PloneTestCase.FunctionalTestCase))
+        self.failUnless(verifyClass(IPloneTestCase,
+                                    PloneTestCase.FunctionalTestCase))
         self.failUnless(verifyObject(IPloneTestCase, self))
 
     def testIPloneSecurity(self):
-        self.failUnless(verifyClass(IPloneSecurity, PloneTestCase.FunctionalTestCase))
+        self.failUnless(verifyClass(IPloneSecurity,
+                                    PloneTestCase.FunctionalTestCase))
         self.failUnless(verifyObject(IPloneSecurity, self))
 
 
@@ -71,4 +79,3 @@ def test_suite():
 
 if __name__ == '__main__':
     framework()
-