Changeset 3547 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser

Timestamp:

Sep 11, 2012 7:30:25 AM (12 years ago)

Author:

ktarasz

Message:

fix pep8

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser

Files:

• keywords.py (modified) (2 diffs)
• seo_configlet.py (modified) (6 diffs)
• viewlets.py (modified) (6 diffs)
• views.py (modified) (12 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/keywords.py

@@ -34 +34 @@
         if text.lower().strip():
             keywords = filter(None, map(lambda x: safe_unicode(x.strip(), enc),
-                                         text.lower().strip().split('\n')))
+                              text.lower().strip().split('\n')))
         else:
             return ts.utranslate(domain='quintagroup.seoptimizer',
@@ -82 +82 @@
                              msgid=_(u'number_keywords',
                                      default=u'Number of keywords at page:\n'
-                                              '${result}',
+                                     '${result}',
                                      mapping={'result': '\n'.join(result)}),
                              context=self.context)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/seo_configlet.py

@@ -31 +31 @@
     exposeDCMetaTags = Bool(
         title=_("label_exposeDCMetaTags",
-                default='Expose <abbr title="Dublin Core">DC</abbr> ' \
+                default='Expose <abbr title="Dublin Core">DC</abbr> '
                 'meta tags'),
         description=_("description_seo_dc_metatags",
@@ -53 +53 @@
         title=_("label_content_type_title", default='Content Types'),
         description=_("description_seo_content_types",
-            default='Select content types that will have SEO properties '
-                'enabled.'),
+                      default='Select content types that will have SEO '
+                      'properties enabled.'),
         required=False,
         missing_value=tuple(),
@@ -64 +64 @@
                 default='Default custom metatags.'),
         description=_("help_default_custom_metatags",
-                      default='Fill in custom metatag names (one per line) ' \
-                      'which will appear on qseo_properties edit tab. ' \
+                      default='Fill in custom metatag names (one per line) '
+                      'which will appear on qseo_properties edit tab. '
                       'Example: "metaname|metacontent" or "metaname".'),
         required=False)
@@ -74 +74 @@
         title=_("label_custom_script", default=u'Header JavaScript'),
         description=_("help_custom_script",
-                default=u"This JavaScript code will be included in "
-                         "the rendered HTML as entered in the page header."),
+                      default=u"This JavaScript code will be included in "
+                      "the rendered HTML as entered in the page header."),
         default=u'',
         required=False)
@@ -98 +98 @@
                 default='External keywords check'),
         description=_("description_external_keywords_test",
-                default='Make keywords test by opening context url as '
-                    'external resource with urllib2.openurl(). This is '
-                    'useful when xdv/Deliverance transformation is used '
-                    'on the site.'),
+                      default='Make keywords test by opening context url as '
+                      'external resource with urllib2.openurl(). This is '
+                      'useful when xdv/Deliverance transformation is used '
+                      'on the site.'),
         default=False,
         required=False)
@@ -174 +174 @@
     def _toFormValue(self, value):
         if value == self.context.missing_value or \
-           value == self.context._type():
+                value == self.context._type():
             return self._missing
         else:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/viewlets.py

@@ -32 +32 @@
         enc = getSiteEncoding(self.context)
         sfuncd = lambda x, enc=enc: safe_unicode(x, enc)
-        return u'\n'.join([TEMPLATE % tuple(map(sfuncd, (k, v))) \
+        return u'\n'.join([TEMPLATE % tuple(map(sfuncd, (k, v)))
                            for k, v in self.listMetaTags().items()])
 
@@ -48 +48 @@
         adapter = IMappingMetaTags(self.context, None)
         mapping_metadata = adapter and adapter.getMappingMetaTags() \
-                           or SortedDict()
+            or SortedDict()
 
         if not use_all:
@@ -98 +98 @@
             # Special cases
             if accessor == 'Description' and \
-               not 'description' in metadata_names:
+                    not 'description' in metadata_names:
                 result['description'] = escape(value)
             elif accessor == 'Subject' and \
-                 not 'keywords' in metadata_names:
+                    not 'keywords' in metadata_names:
                 result['keywords'] = escape(value)
 
@@ -130 +130 @@
             # Filter out DWIMish artifacts on effective / expiration dates
             if effective is not None and \
-               effective > FLOOR_DATE and \
-               effective != created:
+                    effective > FLOOR_DATE and \
+                    effective != created:
                 eff_str = effective.Date()
             else:
@@ -147 +147 @@
         # for given context and default from configlet
         custom_meta_tags = seo_context and \
-                           seo_context['seo_customMetaTags'] or []
+            seo_context['seo_customMetaTags'] or []
         for tag in custom_meta_tags:
             if tag['meta_content']:
@@ -165 +165 @@
                                              name=u'plone_context_state')
         self.seo_context = getMultiAdapter((self.context, self.request),
-                                             name=u'seo_context')
+                                           name=u'seo_context')
 
         self.override_title = self.seo_context['has_seo_title']

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

@@ -14 +14 @@
 from quintagroup.canonicalpath.interfaces import ICanonicalLink
 from quintagroup.canonicalpath.adapters import PROPERTY_LINK \
-                                               as CANONICAL_PROPERTY
+    as CANONICAL_PROPERTY
 
 from quintagroup.seoptimizer.browser.seo_configlet import ISEOConfigletSchema
@@ -63 +63 @@
                                                     default=''),
             "seo_noframes": self.getSEOProperty('qSEO_noframes',
-                                                    default=''),
+                                                default=''),
             "meta_keywords": self.getSEOProperty('qSEO_keywords',
                                                  'Subject', ()),
@@ -71 +71 @@
             "has_seo_title": self.context.hasProperty('qSEO_title'),
             "has_seo_robots": self.context.hasProperty('qSEO_robots'),
-            "has_seo_description": \
-                     self.context.hasProperty('qSEO_description'),
-            "has_seo_distribution": \
-                     self.context.hasProperty('qSEO_distribution'),
+            "has_seo_description":
+            self.context.hasProperty('qSEO_description'),
+            "has_seo_distribution":
+            self.context.hasProperty('qSEO_distribution'),
             "has_html_comment": self.context.hasProperty('qSEO_html_comment'),
             "has_noframes": self.context.hasProperty('qSEO_noframes'),
             "has_seo_keywords": self.context.hasProperty('qSEO_keywords'),
             "has_seo_canonical": self.context.hasProperty(CANONICAL_PROPERTY),
-            }
+        }
         #seotags["seo_nonEmptylocalMetaTags"] = \
         #    bool(seotags["seo_localCustomMetaTags"])
@@ -117 +117 @@
         # Get untouch global, override global in custom
         # and new custom meta tags
-        untouchglob = [t for t in glob \
-                         if t['meta_name'] in list(gnames - lnames)]
+        untouchglob = [t for t in glob
+                       if t['meta_name'] in list(gnames - lnames)]
         return untouchglob + loc
 
@@ -141 +141 @@
         for property, value in context.propertyItems():
             if property.startswith(property_prefix) and \
-               property[len(property_prefix):]:
+                    property[len(property_prefix):]:
                 result.append({'meta_name': property[len(property_prefix):],
                                'meta_content': value})
@@ -157 +157 @@
                 if name_value[0]:
                     result.append({'meta_name': name_value[0],
-                                   'meta_content': len(name_value) == 2 and \
-                                                    name_value[1] or ''})
+                                   'meta_content': len(name_value) == 2 and
+                                   name_value[1] or ''})
         return result
 
@@ -212 +212 @@
         state = ''
         delete_list, seo_overrides_keys, seo_keys = [], [], []
-        seo_items = dict([(k[len(SEO_PREFIX):], v) \
-                         for k, v in kw.items() if k.startswith(SEO_PREFIX)])
+        seo_items = dict([(k[len(SEO_PREFIX):], v)
+                          for k, v in kw.items() if k.startswith(SEO_PREFIX)])
         for key in seo_items.keys():
             if key.endswith(SUFFIX):
@@ -224 +224 @@
             else:
                 if seo_key in seo_overrides_keys and \
-                              seo_items.get(seo_key + SUFFIX):
+                        seo_items.get(seo_key + SUFFIX):
                     seo_value = seo_items[seo_key]
                     if seo_key == 'canonical':
@@ -234 +234 @@
                     else:
                         t_value = 'string'
-                        if type(seo_value) == type([]) or \
-                           type(seo_value) == type(()):
+                        if isinstance(seo_value, list) or \
+                                isinstance(seo_value, tuple):
                             t_value = 'lines'
                         state = self.setProperty(PROP_PREFIX + seo_key,
@@ -264 +264 @@
         for property, value in context.propertyItems():
             if property.startswith(PROP_CUSTOM_PREFIX) and \
-                                   not property == PROP_CUSTOM_PREFIX:
+                    not property == PROP_CUSTOM_PREFIX:
                 delete_list.append(property)
         if delete_list:
@@ -280 +280 @@
                     globalCustomMetaTags.append(
                         {'meta_name': name_value[0],
-                         'meta_content': len(name_value) > 1 and \
-                                         name_value[1] or ''})
+                         'meta_content': len(name_value) > 1 and
+                         name_value[1] or ''})
         for tag in custommetatags:
             meta_name, meta_content = tag['meta_name'], tag['meta_content']
             if meta_name:
-                if not [gmt for gmt in globalCustomMetaTags \
-                        if (gmt['meta_name'] == meta_name and \
+                if not [gmt for gmt in globalCustomMetaTags
+                        if (gmt['meta_name'] == meta_name and
                             gmt['meta_content'] == meta_content)]:
                     self.setProperty('%s%s' % (PROP_CUSTOM_PREFIX, meta_name),
@@ -344 +344 @@
             else:
                 # Cancel
-                msg = _('seoproperties_canceled', default=u'No content SEO ' \
+                msg = _('seoproperties_canceled', default=u'No content SEO '
                         'properties have been changed.')