Fix code analysis

sc/social/like/browser/canonicalurl.py

@@ -24,8 +24,7 @@ class ICanonicalURLUpdater(model.Schema):
             default=u'The canonical domain will be used to construct the canonical URL (<code>og:url</code> property) of portal objects. '
                     u'Use the domain name of your site (e.g. <strong>http://www.example.org</strong> or <strong>https://www.example.org</strong>). '
                     u'Facebook will use the canonical URL to ensure that all actions such as likes and shares aggregate at the same URL rather than spreading across multiple versions of a page. '
-                    u'Check <a href="https://pypi.python.org/pypi/sc.social.like">package documentation</a> for more information on how to use this feature.'
-        ),
+                    u'Check <a href="https://pypi.python.org/pypi/sc.social.like">package documentation</a> for more information on how to use this feature.'),
         required=True,
         constraint=validate_canonical_domain,
     )
@@ -35,8 +34,7 @@ class ICanonicalURLUpdater(model.Schema):
         description=_(
             u'help_published_before',
             default=u'Objects published before this date will be updated using the canonical domain defined in this form; '
-                    u'objects published on or after this date will be updated using the canonical domain defined in the control panel configlet.'
-        ),
+                    u'objects published on or after this date will be updated using the canonical domain defined in the control panel configlet.'),
         required=True,
     )
 
@@ -48,8 +46,7 @@ class CanonicalURLUpdater(form.Form):
     label = _(u'Canonical URL updater form')
     description = _(
         u'This form will update the canonical URL of all Dexterity-based '
-        u'objects in the catalog providing the Social Media behavior.'
-    )
+        u'objects in the catalog providing the Social Media behavior.')
     ignoreContext = True
 
     @property

sc/social/like/browser/viewlets.py

@@ -92,7 +92,7 @@ def enabled(self):
         # If using folder_full_view or all_content, we add metadata
         # in order to proper display share buttons for
         # contained content types
-        if template in ('all_content', 'folder_full_view',):
+        if template in ('all_content', 'folder_full_view'):
             return True
         return self.helper.enabled(self.view)
 

sc/social/like/interfaces.py

@@ -72,7 +72,7 @@ class ISocialLikeSettings(model.Schema):
         required=True,
         default=DEFAULT_ENABLED_CONTENT_TYPES,
         value_type=schema.Choice(
-            vocabulary='plone.app.vocabularies.ReallyUserFriendlyTypes')
+            vocabulary='plone.app.vocabularies.ReallyUserFriendlyTypes'),
     )
 
     plugins_enabled = schema.Tuple(
@@ -83,7 +83,7 @@ class ISocialLikeSettings(model.Schema):
         ),
         required=False,
         default=DEFAULT_PLUGINS_ENABLED,
-        value_type=schema.Choice(vocabulary='sc.social.likes.plugins')
+        value_type=schema.Choice(vocabulary='sc.social.likes.plugins'),
     )
 
     validation_enabled = schema.Bool(
@@ -92,8 +92,7 @@ class ISocialLikeSettings(model.Schema):
             u'help_validation_enabled',
             default=u'Enables validation to check if content follows social networks sharing best practices. '
                     u'The validation includes title, description and lead image fields. '
-                    u'This feature is only available for Dexterity-based content types.'
-        ),
+                    u'This feature is only available for Dexterity-based content types.'),
         default=True,
     )
 
@@ -116,8 +115,7 @@ class ISocialLikeSettings(model.Schema):
                     u'widgets , instead simple links will be used.\n'
                     u'This will limits user experience and features '
                     u'(like the share count) but will enhance users privacy: '
-                    u'no 3rd party cookies will be sent to users.'
-        ),
+                    u'no 3rd party cookies will be sent to users.'),
         default=False,
     )
 
@@ -137,8 +135,7 @@ class ISocialLikeSettings(model.Schema):
             default=u'The canonical domain will be used to construct the canonical URL (<code>og:url</code> property) of portal objects. '
                     u'Use the domain name of your site (e.g. <strong>http://www.example.org</strong> or <strong>https://www.example.org</strong>). '
                     u'Facebook will use the canonical URL to ensure that all actions such as likes and shares aggregate at the same URL rather than spreading across multiple versions of a page. '
-                    u'Check <a href="https://pypi.python.org/pypi/sc.social.like">package documentation</a> for more information on how to use this feature.'
-        ),
+                    u'Check <a href="https://pypi.python.org/pypi/sc.social.like">package documentation</a> for more information on how to use this feature.'),
         required=True,
         constraint=validate_canonical_domain,
     )
@@ -149,8 +146,7 @@ class ISocialLikeSettings(model.Schema):
         description=_(
             u'help_fallback_image',
             default=u'Content without a lead image will use this image as fallback (<code>og:image</code> property). '
-                    u'There could be a delay of up to 2 minutes when replacing this image.'
-        ),
+                    u'There could be a delay of up to 2 minutes when replacing this image.'),
         required=False,
         constraint=validate_og_fallback_image,
     )
@@ -164,7 +160,7 @@ class ISocialLikeSettings(model.Schema):
             'facebook_app_id',
             'fbbuttons',
             'fbshowlikes',
-            'facebook_prefetch_enabled'
+            'facebook_prefetch_enabled',
         ],
     )
 
@@ -174,8 +170,7 @@ class ISocialLikeSettings(model.Schema):
             u'help_verb_display',
             default=u'The verb to display in the Facebook button. '
                     u'Currently only "like" and "recommend" are '
-                    u'supported.',
-        ),
+                    u'supported.'),
         required=True,
         default=u'like',
         vocabulary=FacebookVerbsVocabulary,
@@ -186,8 +181,7 @@ class ISocialLikeSettings(model.Schema):
         description=_(
             u'help_admins',
             default=u'A comma-separated list of either the '
-                    u'Facebook IDs of page administrators.',
-        ),
+                    u'Facebook IDs of page administrators.'),
         required=False,
         default='',
     )
@@ -197,8 +191,7 @@ class ISocialLikeSettings(model.Schema):
         description=_(
             u'help_appid',
             default=u'A Facebook Platform application ID.\n'
-                    u'This is required when \"Do not track users\" option is enabled.',
-        ),
+                    u'This is required when \"Do not track users\" option is enabled.'),
         required=False,
         default='',
     )
@@ -219,8 +212,7 @@ class ISocialLikeSettings(model.Schema):
         description=_(
             u'help_show_likes',
             default=u'If enabled, the Facebook button will show the number of '
-                    u'Facebook users who have already liked this page.'
-        ),
+                    u'Facebook users who have already liked this page.'),
         default=True,
     )
 
@@ -232,8 +224,7 @@ class ISocialLikeSettings(model.Schema):
                     u'crawler scrape and cache metadata every time a new '
                     u'piece content is published and every time published '
                     u'content is edited. '
-                    u'This will keep the metadata updated on Facebook always.'
-        ),
+                    u'This will keep the metadata updated on Facebook always.'),
         default=False,
     )
 
@@ -244,8 +235,7 @@ class ISocialLikeSettings(model.Schema):
         title=_(u'Twitter nick'),
         description=_(
             u'help_your_twitter_nick',
-            default=u'Enter your twitter nick. eg. simplesconsultoria',
-        ),
+            default=u'Enter your twitter nick. eg. simplesconsultoria'),
         required=False,
         default='',
     )

sc/social/like/plugins/facebook/utils.py

@@ -40,7 +40,7 @@ def facebook_language(languages, default):
     if not languages:
         # do not change anything
         return default
-    languages = [languages, ] if not isinstance(languages, list) else languages
+    languages = [languages] if not isinstance(languages, list) else languages
     languages = [fix_iso(l) for l in languages]
     prefered = [l for l in languages if l in FB_LOCALES]
     return prefered and prefered[0] or default

sc/social/like/subscribers.py

@@ -111,8 +111,7 @@ def assign_canonical_url(obj, event):
     else:
         logger.warn(
             'Canonical domain not set in Social Media configlet; '
-            "Facebook's Open Graph canonical URL (og:orl) will not be available"
-        )
+            "Facebook's Open Graph canonical URL (og:orl) will not be available")
 
 
 def check_sharing_best_practices(obj, event):

sc/social/like/tests/test_plugin_facebook.py

@@ -193,11 +193,11 @@ def test_fix_iso(self):
     def test_facebook_language(self):
         default = 'en_US'
         self.assertEqual(facebook_language(['pt-br', 'pt'], default), 'pt_BR')
-        self.assertEqual(facebook_language(['de', ], default), 'de_DE')
-        self.assertEqual(facebook_language(['it', ], default), 'it_IT')
+        self.assertEqual(facebook_language(['de'], default), 'de_DE')
+        self.assertEqual(facebook_language(['it'], default), 'it_IT')
         self.assertEqual(facebook_language(['fi', 'en'], default), 'fi_FI')
-        self.assertEqual(facebook_language(['ga', ], default), 'ga_IE')
-        self.assertEqual(facebook_language(['ji', ], default), default)
+        self.assertEqual(facebook_language(['ga'], default), 'ga_IE')
+        self.assertEqual(facebook_language(['ji'], default), default)
         self.assertEqual(facebook_language([], default), default)
 
 

sc/social/like/tiles/facebook.py

@@ -41,8 +41,7 @@ class IFacebookTile(IPersistentCoverTile):
         title=_(u'Width'),
         description=_(
             u'Set the maximum width of the widget between 180 and 500 pixels. '
-            u'Leave it empty to automatically adjust the widget to the width of the tile.'
-        ),
+            u'Leave it empty to automatically adjust the widget to the width of the tile.'),
         required=False,
         default=None,
         min=180,
@@ -53,8 +52,7 @@ class IFacebookTile(IPersistentCoverTile):
         title=_(u'Height'),
         description=_(
             u'Set the height of a displayed widget, overriding the value stored with the widget ID. '
-            u'Must be greater than 70 pixels. '
-        ),
+            u'Must be greater than 70 pixels. '),
         required=True,
         default=500,
         min=70,

sc/social/like/tiles/twitter.py

@@ -42,8 +42,7 @@ class ITwitterTile(IPersistentCoverTile):
         title=_(u'Width'),
         description=_(
             u'Set the maximum width of the widget between 180 and 520 pixels. '
-            u'Leave it empty to automatically adjust the widget to the width of the tile.'
-        ),
+            u'Leave it empty to automatically adjust the widget to the width of the tile.'),
         required=False,
         default=None,
         min=180,
@@ -55,8 +54,7 @@ class ITwitterTile(IPersistentCoverTile):
         description=_(
             u'Set the height of a displayed widget, overriding the value stored with the widget ID. '
             u'Must be greater than 200 pixels. '
-            u'Note: this parameter does not apply if a tweet limit has been specified.'
-        ),
+            u'Note: this parameter does not apply if a tweet limit has been specified.'),
         required=False,
         default=500,
         min=200,
@@ -73,8 +71,7 @@ class ITwitterTile(IPersistentCoverTile):
         title=_(u'Tweet limit'),
         description=_(
             u'Display an expanded timeline of between 1 and 20 tweets. '
-            u'Leave it empty to use the default or to set the height of the widget.'
-        ),
+            u'Leave it empty to use the default or to set the height of the widget.'),
         required=False,
         default=None,
         min=1,
@@ -86,8 +83,7 @@ class ITwitterTile(IPersistentCoverTile):
         description=_(
             u'A timeline widget is a live region of a page which may receive updates as new tweets become available. '
             u'When specified as polite, assistive technologies will notify users of updates but generally do not interrupt the current task, and updates take low priority. '
-            u'When specified as assertive, assistive technologies will immediately notify the user, and could potentially clear the speech queue of previous updates.'
-        ),
+            u'When specified as assertive, assistive technologies will immediately notify the user, and could potentially clear the speech queue of previous updates.'),
         required=True,
         values=['polite', 'assertive'],
         default='polite',

sc/social/like/upgrades/v3046/__init__.py

@@ -11,8 +11,7 @@ def reindex_catalog(setup_tool):
     test = 'test' in setup_tool.REQUEST  # used to ignore transactions on tests
     logger.info(
         u'Reindexing the catalog. '
-        u'This process could take a long time on large sites. Be patient.'
-    )
+        u'This process could take a long time on large sites. Be patient.')
     catalog = api.portal.get_tool('portal_catalog')
     results = catalog()
     logger.info(u'Found {0} objects'.format(len(results)))