Merge pull request #89 from plone/readability-cleanup

Readability cleanup

plone/__init__.py

@@ -1,6 +1,2 @@
-# 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__)
+# -*- coding: utf-8 -*-
+__import__('pkg_resources').declare_namespace(__name__)

plone/app/__init__.py

@@ -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__)

plone/app/layout/__init__.py

@@ -1 +1 @@
-#
+# -*- coding: utf-8 -*-

plone/app/layout/analytics/__init__.py

@@ -1 +1 @@
-#
+# -*- coding: utf-8 -*-

plone/app/layout/analytics/tests/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

plone/app/layout/analytics/tests/base.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from plone.app.testing.bbb import PloneTestCase
 
 

plone/app/layout/analytics/tests/test_doctests.py

@@ -1,8 +1,10 @@
-import unittest
-import doctest
+# -*- coding: utf-8 -*-
+from plone.app.layout.analytics.tests import base
 from Testing import ZopeTestCase as ztc
 
-from plone.app.layout.analytics.tests import base
+import doctest
+import unittest
+
 
 OPTIONFLAGS = (doctest.REPORT_ONLY_FIRST_FAILURE |
                doctest.ELLIPSIS |

plone/app/layout/analytics/view.py

@@ -1,15 +1,14 @@
-from Products.CMFPlone.interfaces import ISiteSchema
+# -*- coding: utf-8 -*-
 from plone.registry.interfaces import IRegistry
-
+from Products.CMFPlone.interfaces import ISiteSchema
+from Products.Five.browser import BrowserView
 from zope.component import getUtility
-from zope.interface import implements
+from zope.interface import implementer
 from zope.viewlet.interfaces import IViewlet
 
-from Products.Five.browser import BrowserView
-
 
+@implementer(IViewlet)
 class AnalyticsViewlet(BrowserView):
-    implements(IViewlet)
 
     def __init__(self, context, request, view, manager):
         super(AnalyticsViewlet, self).__init__(context, request)
@@ -25,10 +24,11 @@ def update(self):
     def render(self):
         """render the webstats snippet"""
         registry = getUtility(IRegistry)
-        site_settings = registry.forInterface(ISiteSchema, prefix="plone", check=False)
+        site_settings = registry.forInterface(
+            ISiteSchema, prefix="plone", check=False)
         try:
             if site_settings.webstats_js:
                 return site_settings.webstats_js
-            return ''
         except AttributeError:
-            return ''
+            pass
+        return ''

plone/app/layout/dashboard/__init__.py

@@ -1 +1 @@
-#
+# -*- coding: utf-8 -*-

plone/app/layout/dashboard/dashboard.py

@@ -1,38 +1,37 @@
-from zope.component import getUtility
-from zope import interface
-
+# -*- coding: utf-8 -*-
 from AccessControl import getSecurityManager
-from Products.Five.browser import BrowserView
-
-from plone.portlets.interfaces import IPortletManager
-from plone.portlets.constants import USER_CATEGORY, GROUP_CATEGORY
-
 from plone.memoize.instance import memoize
-
+from plone.portlets.constants import GROUP_CATEGORY
+from plone.portlets.constants import USER_CATEGORY
+from plone.portlets.interfaces import IPortletManager
+from plone.protect.authenticator import createToken
 from Products.CMFCore.utils import getToolByName
-from Products.statusmessages.interfaces import IStatusMessage
 from Products.CMFPlone import PloneMessageFactory as _
-from plone.protect.authenticator import createToken
+from Products.Five.browser import BrowserView
+from Products.statusmessages.interfaces import IStatusMessage
+from zope.component import getUtility
+from zope.interface import implementer
+from zope.interface import Interface
 
 
-class IDashboard(interface.Interface):
+class IDashboard(Interface):
     """the dashboard display columns of portlet to the loggedin user"""
 
 
+@implementer(IDashboard)
 class DashboardView(BrowserView):
     """Power the dashboard
     """
-    interface.implements(IDashboard)
 
     def __call__(self):
-        self.request.set('disable_border',1)
-        self.request.set('disable_plone.leftcolumn',1)
-        self.request.set('disable_plone.rightcolumn',1)
+        self.request.set('disable_border', 1)
+        self.request.set('disable_plone.leftcolumn', 1)
+        self.request.set('disable_plone.rightcolumn', 1)
         if self.can_edit() and self.empty():
             message = _(u"info_empty_dashboard",
-                    default=u"Your dashboard is currently empty. Click the"
-                             " <em>edit</em> tab to assign some personal"
-                             " portlets.")
+                        default=u"Your dashboard is currently empty. Click the"
+                        " <em>edit</em> tab to assign some personal"
+                        " portlets.")
             IStatusMessage(self.request).add(message)
         return self.index()
 

plone/app/layout/dashboard/user_actions.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from Products.Five.browser import BrowserView
 from zope.component import getMultiAdapter
 
@@ -7,8 +8,10 @@ class UserActionsView(BrowserView):
     """
 
     def user_actions(self):
-        context_state = getMultiAdapter((self.context, self.request),
-                                        name=u'plone_context_state')
+        context_state = getMultiAdapter(
+            (self.context, self.request),
+            name=u'plone_context_state'
+        )
 
         actions = context_state.actions('user')
         return actions

plone/app/layout/globals/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

plone/app/layout/globals/context.py

@@ -1,35 +1,34 @@
-from zope.interface import implements
-from zope.component import getMultiAdapter
-from zope.component import queryAdapter
-from zope.component import queryMultiAdapter
-from zope.component import getUtility
+# -*- coding: utf-8 -*-
+from Acquisition import aq_base
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from interfaces import IContextState
 from plone.memoize.view import memoize
-
-from Acquisition import aq_base, aq_inner, aq_parent
-from Products.Five.browser import BrowserView
-
-from Products.CMFCore.interfaces import ISiteRoot, IDynamicType
-from Products.CMFDynamicViewFTI.interfaces import IBrowserDefault
-from Products.CMFPlone.interfaces import INonStructuralFolder
-
+from plone.portlets.interfaces import ILocalPortletAssignable
+from plone.registry.interfaces import IRegistry
+from Products.CMFCore.interfaces import IDynamicType
+from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName
+from Products.CMFDynamicViewFTI.interfaces import IBrowserDefault
 from Products.CMFPlone import utils
-from plone.registry.interfaces import IRegistry
-
-from interfaces import IContextState
+from Products.CMFPlone.interfaces import INonStructuralFolder
+from Products.Five.browser import BrowserView
+from zope.component import getMultiAdapter
+from zope.component import getUtility
+from zope.component import queryAdapter
+from zope.component import queryMultiAdapter
+from zope.interface import implementer
 
-from plone.portlets.interfaces import ILocalPortletAssignable
 
 BLACKLISTED_PROVIDERS = ('portal_workflow', )
 BLACKLISTED_CATEGORIES = ('folder_buttons', 'object_buttons', )
 
 
+@implementer(IContextState)
 class ContextState(BrowserView):
     """Information about the state of the current context
     """
 
-    implements(IContextState)
-
     @memoize
     def current_page_url(self):
         url = self.current_base_url()
@@ -73,7 +72,8 @@ def view_url(self):
         view_url = self.object_url()
         portal_type = getattr(aq_base(self.context), 'portal_type', None)
         registry = getUtility(IRegistry)
-        use_view_action = registry.get('plone.types_use_view_action_in_listings', [])
+        use_view_action = registry.get(
+            'plone.types_use_view_action_in_listings', [])
         if portal_type in use_view_action:
             view_url = view_url + '/view'
         return view_url

plone/app/layout/globals/interface.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 from Acquisition import aq_base
-from Products.Five.browser import BrowserView
 from interfaces import IInterfaceInformation
 from plone.memoize.view import memoize
+from Products.Five.browser import BrowserView
 from zope.dottedname.resolve import resolve
-from zope.interface import Interface, implements, providedBy
+from zope.interface import implementer
+from zope.interface import Interface
+from zope.interface import providedBy
 from zope.interface.interfaces import IMethod
 
 
@@ -47,8 +49,8 @@ def visitBaseInterfaces(iface, lst):
         visitBaseInterfaces(iface, lst)
 
 
+@implementer(IInterfaceInformation)
 class InterfaceInformation(BrowserView):
-    implements(IInterfaceInformation)
 
     @memoize
     def provides(self, dotted_name):

plone/app/layout/globals/layout.py

@@ -1,10 +1,4 @@
-import json
-
-from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.interfaces.controlpanel import ILinkSchema
-from Products.CMFPlone.interfaces.controlpanel import ISiteSchema
-from Products.Five.browser.metaconfigure import ViewMixinForTemplates
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+# -*- coding: utf-8 -*-
 from plone.app.layout.globals.interfaces import ILayoutPolicy
 from plone.app.layout.globals.interfaces import IViewView
 from plone.app.layout.icons.interfaces import IContentIcon
@@ -13,24 +7,28 @@
 from plone.portlets.interfaces import IPortletManager
 from plone.portlets.interfaces import IPortletManagerRenderer
 from plone.registry.interfaces import IRegistry
-from zope.browserpage.viewpagetemplatefile import (
-    ViewPageTemplateFile as ZopeViewPageTemplateFile
-)
+from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.interfaces.controlpanel import ILinkSchema
+from Products.CMFPlone.interfaces.controlpanel import ISiteSchema
+from Products.Five.browser.metaconfigure import ViewMixinForTemplates
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile as ZopeViewPageTemplateFile  # noqa
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.component import queryMultiAdapter
 from zope.component import queryUtility
 from zope.interface import alsoProvides
-from zope.interface import implements
+from zope.interface import implementer
 from zope.publisher.browser import BrowserView
 
+import json
+
 
+@implementer(ILayoutPolicy)
 class LayoutPolicy(BrowserView):
     """A view that gives access to various layout related functions.
     """
 
-    implements(ILayoutPolicy)
-
     def mark_view(self, view):
         """Adds a marker interface to the view if it is "the" view for the
         context May only be called from a template.
@@ -88,7 +86,8 @@ def icons_visible(self):
         anon = membership.isAnonymousUser()
 
         registry = getUtility(IRegistry)
-        settings = registry.forInterface(ISiteSchema, prefix="plone", check=False)
+        settings = registry.forInterface(
+            ISiteSchema, prefix="plone", check=False)
         icon_visibility = settings.icon_visibility
 
         if icon_visibility == 'enabled':
@@ -106,7 +105,8 @@ def thumb_visible(self):
         membership = getToolByName(context, "portal_membership")
         anon = membership.isAnonymousUser()
         registry = getUtility(IRegistry)
-        settings = registry.forInterface(ISiteSchema, prefix="plone", check=False)
+        settings = registry.forInterface(
+            ISiteSchema, prefix="plone", check=False)
         thumb_visibility = settings.thumb_visibility
 
         if thumb_visibility == 'enabled':
@@ -223,10 +223,12 @@ def bodyClass(self, template, view):
         else:
             user = membership.getAuthenticatedMember()
             for role in user.getRolesInContext(self.context):
-                body_classes.append('userrole-' + role.lower().replace(' ', '-'))
+                body_classes.append(
+                    'userrole-' + role.lower().replace(' ', '-'))
 
             registry = getUtility(IRegistry)
-            settings = registry.forInterface(ISiteSchema, prefix='plone', check=False)
+            settings = registry.forInterface(
+                ISiteSchema, prefix='plone', check=False)
 
             # toolbar classes
             try:

plone/app/layout/globals/patterns_settings.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from zope.deferredimport import deprecated
 
+
 deprecated(
     "Import from Products.CMFPlone.patterns.view instead",
     PatternSettings='Products.CMFPlone.patterns.view.PatternSettingsView'

plone/app/layout/globals/portal.py

@@ -1,32 +1,30 @@
-from zope.interface import implements
-from zope.component import getUtility
-from zope.component import providedBy
-from zope.component.hooks import getSite
+# -*- coding: utf-8 -*-
+from Acquisition import aq_inner
+from interfaces import IPortalState
+from plone.app.layout.navigation.root import getNavigationRoot
+from plone.app.layout.navigation.root import getNavigationRootObject
+from plone.memoize.view import memoize
+from plone.memoize.view import memoize_contextless
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import ISiteRoot
-from Products.CMFPlone.interfaces import ISiteSchema
-from plone.memoize.view import memoize_contextless
-from plone.memoize.view import memoize
-
-from Acquisition import aq_inner
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.interfaces import ILanguageSchema
 from Products.CMFPlone.interfaces import ISearchSchema
+from Products.CMFPlone.interfaces import ISiteSchema
 from Products.Five.browser import BrowserView
+from zope.component import getUtility
+from zope.component import providedBy
+from zope.component.hooks import getSite
+from zope.interface import implementer
 
-from plone.app.layout.navigation.root import getNavigationRoot
-from plone.app.layout.navigation.root import getNavigationRootObject
-
-
-from interfaces import IPortalState
 
 RIGHT_TO_LEFT = ['ar', 'fa', 'he', 'ps']
 
 
+@implementer(IPortalState)
 class PortalState(BrowserView):
     """Information about the state of the portal
     """
-    implements(IPortalState)
 
     @memoize_contextless
     def portal(self):
@@ -40,7 +38,8 @@ def portal(self):
     @memoize_contextless
     def portal_title(self):
         registry = getUtility(IRegistry)
-        settings = registry.forInterface(ISiteSchema, prefix="plone", check=False)
+        settings = registry.forInterface(
+            ISiteSchema, prefix="plone", check=False)
         return settings.site_title
 
     @memoize_contextless

plone/app/layout/globals/tests/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-