Merge pull request #14 from plone/cleanup

Cleanup
plone · Feb 5, 2016 · ec17664 · ec17664 · jenkins-plone-org · Feb 5, 2016
2 parents ef3df6d + 1e2a0e4
commit ec17664
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/plone/app/contentlisting/catalog.py b/plone/app/contentlisting/catalog.py
@@ -25,8 +25,8 @@ def __init__(self, brain):
         self.request = aq_get(brain, 'REQUEST')
 
     def __repr__(self):
-        return "<plone.app.contentlisting.catalog."\
-            "CatalogContentListingObject instance at {0}>".format(
+        return '<plone.app.contentlisting.catalog.'\
+            'CatalogContentListingObject instance at {0}>'.format(
                 self.getPath()
             )
 

diff --git a/plone/app/contentlisting/contentlisting.py b/plone/app/contentlisting/contentlisting.py
@@ -4,9 +4,9 @@
 from plone.i18n.normalizer.interfaces import IIDNormalizer
 from plone.registry.interfaces import IRegistry
 from Products.CMFPlone.interfaces import INavigationSchema
-from zope.interface import implementer
 from zope.component import getUtility
 from zope.component import queryUtility
+from zope.interface import implementer
 
 
 @implementer(IContentListing)
@@ -105,13 +105,13 @@ def __eq__(self, other):
     def ContentTypeClass(self):
         """A normalised type name that identifies the object in listings.
         used for CSS styling"""
-        return "contenttype-" + queryUtility(IIDNormalizer).normalize(
+        return 'contenttype-' + queryUtility(IIDNormalizer).normalize(
             self.PortalType())
 
     def ReviewStateClass(self):
         """A normalised review state string for CSS styling use in listings.
         """
-        return "state-" + queryUtility(IIDNormalizer).normalize(
+        return 'state-' + queryUtility(IIDNormalizer).normalize(
             self.review_state())
 
     def appendViewAction(self):
@@ -121,7 +121,7 @@ def appendViewAction(self):
         registry = getUtility(IRegistry)
         types = registry.get('plone.types_use_view_action_in_listings', [])
         if self.portal_type in types:
-            return "/view"
+            return '/view'
         return ''
 
     def isVisibleInNav(self):

diff --git a/plone/app/contentlisting/realobject.py b/plone/app/contentlisting/realobject.py
@@ -18,8 +18,8 @@ def __init__(self, obj):
         self.request = aq_get(obj, 'REQUEST')
 
     def __repr__(self):
-        return "<plone.app.contentlisting.realobject."\
-            "RealContentListingObject instance at {0}>".format(
+        return '<plone.app.contentlisting.realobject.'\
+            'RealContentListingObject instance at {0}>'.format(
                 self.getPath()
             )
 
@@ -66,7 +66,7 @@ def uuid(self):
 
     def review_state(self):
         obj = self.getObject()
-        wftool = getToolByName(obj, "portal_workflow")
+        wftool = getToolByName(obj, 'portal_workflow')
         return wftool.getInfoFor(obj, 'review_state')
 
     def Type(self):

diff --git a/plone/app/contentlisting/tests/base.py b/plone/app/contentlisting/tests/base.py
@@ -7,6 +7,7 @@
 from plone.app.testing import TEST_USER_ID
 from Products.CMFCore.utils import getToolByName
 from zope.configuration import xmlconfig
+
 import unittest2 as unittest
 
 
@@ -26,11 +27,11 @@ def setUpZope(self, app, configurationContext):
 CONTENTLISTING_FIXTURE = ContentListingLayer()
 CONTENTLISTING_INTEGRATION_TESTING = IntegrationTesting(
     bases=(CONTENTLISTING_FIXTURE, ),
-    name="ContentListing:Integration"
+    name='ContentListing:Integration'
 )
 CONTENTLISTING_FUNCTIONAL_TESTING = FunctionalTesting(
     bases=(CONTENTLISTING_FIXTURE, ),
-    name="ContentListing:Functional"
+    name='ContentListing:Functional'
 )
 
 

diff --git a/plone/app/contentlisting/tests/test_integration_doctest.py b/plone/app/contentlisting/tests/test_integration_doctest.py
@@ -1,5 +1,7 @@
-from .base import ContentlistingFunctionalTestCase
+# -*- coding: utf-8 -*-
+from plone.app.contentlisting.tests.base import ContentlistingFunctionalTestCase  # noqa
 from Testing import ZopeTestCase as ztc
+
 import doctest
 import unittest
 

diff --git a/plone/app/contentlisting/tests/test_integration_unit.py b/plone/app/contentlisting/tests/test_integration_unit.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 from plone.app.contentlisting.interfaces import IContentListing
 from plone.app.contentlisting.interfaces import IContentListingObject
-from plone.app.contentlisting.tests.base import \
-    ContentlistingFunctionalTestCase
+from plone.app.contentlisting.tests.base import ContentlistingFunctionalTestCase  # noqa
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.batching.interfaces import IBatch
@@ -87,7 +86,7 @@ def test_special_getattr_from_brain(self):
 
     def test_special_getattr_from_object(self):
         # Asking for an attribute not in the contentlistingobject, should
-        # defer lookup to the brain"""
+        # defer lookup to the brain
         self.assertEqual(self.item.absolute_url(), '')
         self.assertEqual(
             repr(self.item.getDataOrigin()),
@@ -116,7 +115,7 @@ def test_item_getSize(self):
         self.assertEqual(self.item.getSize().upper(), '0 KB')
 
     def test_item_reviewState(self):
-        wftool = getToolByName(self.realitem, "portal_workflow")
+        wftool = getToolByName(self.realitem, 'portal_workflow')
         wf = wftool.getInfoFor(self.realitem, 'review_state')
         self.assertEqual(self.item.review_state(), wf)
 
@@ -196,7 +195,7 @@ def test_item_getURL(self):
         self.assertEqual(self.item.getURL(), self.realitem.absolute_url())
 
     def test_item_reviewState(self):
-        wftool = getToolByName(self.realitem, "portal_workflow")
+        wftool = getToolByName(self.realitem, 'portal_workflow')
         wf = wftool.getInfoFor(self.realitem, 'review_state')
         self.assertEqual(self.item.review_state(), wf)