Changeset 1910 in products for quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup

Timestamp:

Mar 15, 2010 4:24:07 PM (14 years ago)

Author:

mylan

Message:

#160: clarify code, some clean-up

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• adapters.py (modified) (2 diffs)
• browser/interfaces.py (modified) (1 diff)
• browser/keywords.py (modified) (1 diff)
• config.py (modified) (1 diff)
• setuphandlers.py (modified) (1 diff)
• upgrades.py (modified) (4 diffs)
• util.py (modified) (1 diff)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/adapters.py

@@ -41 +41 @@
         """ See interface.
         """
-        request = self.context.REQUEST
         meta_keywords = []
-        filtered_keywords = []
-        seo_context = queryMultiAdapter((self.context, request), name='seo_context')
+        seo_context = queryMultiAdapter((self.context, self.context.REQUEST),
+                                        name='seo_context')
         if seo_context:
             meta_keywords = list(seo_context['meta_keywords'])
@@ -79 +78 @@
 
     def canonical_path(self):
-        purl = getToolByName(self.context,'portal_url')
+        purl = getToolByName(self.context, 'portal_url')
 
         # Calculate canonical path from qSEO_canonical property

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/browser/interfaces.py

@@ -11 +11 @@
 
     def validateKeywords(text):
-        """ Parse text and validate each keyword (extracted from text) for appearing on the context page """
+        """ Parse text and validate each keyword (extracted from text)
+        for appearing on the context page """

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/browser/keywords.py

@@ -30 +30 @@
         url = '%s?without_metatag_keywords=1' % self.context.absolute_url()
 
-        # extract words from url page using lynx browser (test page by 'url' randered without metatag keywords)
+        # extract words from url page using lynx browser (test page by 'url'
+        # randered without metatag keywords)
         page_text = commands.getoutput('lynx --dump --nolist %s' % url).lower()
         if page_text and page_text != 'sh: lynx: command not found':

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/config.py

@@ -7 +7 @@
 SHEET_TITLE = 'SEO Properties'
 
-STOP_WORDS = ['a', 'an', 'amp', 'and', 'are', 'arial', 'as', 'at', 'be', 'but', 'by', 'can', 'com', 'do', 'font',
-              'for', 'from', 'gif', 'had', 'has', 'have', 'he', 'helvetica', 'her', 'his', 'how', 'href', 'i',
-              'if', 'in', 'is', 'it', 'javascript', 'jpg', 'made', 'net', 'of', 'on', 'or', 'org', 'our', 'sans',
-              'see', 'serif', 'she', 'that', 'the', 'this', 'to', 'us', 'we', 'with', 'you', 'your']
+STOP_WORDS = ['a', 'an', 'amp', 'and', 'are', 'arial', 'as', 'at', 'be', 'but',
+    'by', 'can', 'com', 'do', 'font', 'for', 'from', 'gif', 'had', 'has',
+    'have', 'he', 'helvetica', 'her', 'his', 'how', 'href', 'i', 'if', 'in',
+    'is', 'it', 'javascript', 'jpg', 'made', 'net', 'of', 'on', 'or', 'org',
+    'our', 'sans', 'see', 'serif', 'she', 'that', 'the', 'this', 'to', 'us',
+    'we', 'with', 'you', 'your']
 
 DEFAULT_CUSTOM_METATAGS = []

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/setuphandlers.py

@@ -24 +24 @@
     types_tool = getToolByName(site, 'portal_types')
     for ptype in types_tool.objectValues():
-        idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions()) if idx_act[1].id == 'seo_properties']
+        idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions()) \
+                           if idx_act[1].id == 'seo_properties']
         if idxs:
             ptype.deleteActions(idxs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/upgrades.py

@@ -10 +10 @@
 
 def changeDomain(plone_tools):
-    """ Fix i18n_domain bug for some portal_types, which present in earlier versions of the package.
+    """ Fix i18n_domain bug for some portal_types,
+    which present in earlier versions of the package.
     """
     types_tool = plone_tools.types()
-    for ptype in [ptypes for ptypes in types_tool.objectValues() if ptypes.id in FIX_PTYPES_DOMAIN]:
+    for ptype in [ptypes for ptypes in types_tool.objectValues()
+                         if ptypes.id in FIX_PTYPES_DOMAIN]:
         if ptype.i18n_domain == 'quintagroup.seoptimizer':
             ptype.i18n_domain = 'plone'
-            logger.log(logging.INFO, "I18n Domain of the type \'%s\' changed to \'plone\'." % ptype.id)
+            logger.log(logging.INFO, "I18n Domain of the type \'%s\' "
+                       "changed to \'plone\'." % ptype.id)
 
 def changeMetatagsOrderList(plone_tools):
@@ -28 +31 @@
         mto_new = [line.split(' ')[0].strip() for line in mto]
         if not list(mto) == mto_new:
-            logger.log(logging.INFO, "Changed format metatags order list in configlet from \"metaname accessor\" to \"metaname\".")
+            logger.log(logging.INFO, "Changed format metatags order list in "
+                       "configlet from \"metaname accessor\" to \"metaname\".")
             seoprops_tool.manage_changeProperties(metatags_order=mto_new)
     else:
-        setup_tool.runImportStepFromProfile('profile-quintagroup.seoptimizer:default', 'propertiestool')
+        setup_tool.runImportStepFromProfile('profile-quintagroup.seoptimizer:default',
+                                            'propertiestool')
 
 
 def migrationActions(plone_tools):
-    """ Migration actions from portal_types action to seoproperties tool (for seoaction in portal_actions).
+    """ Migration actions from portal_types action to seoproperties tool
+    (for seoaction in portal_actions).
     """
     types_tool = plone_tools.types()
@@ -42 +48 @@
     flag = False
     for ptype in types_tool.objectValues():
-        idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions()) if idx_act[1].id == 'seo_properties']
+        idxs = [idx_act[0] for idx_act in enumerate(ptype.listActions())
+                           if idx_act[1].id == 'seo_properties']
         if idxs:
             if ptype.id not in ctws:
@@ -48 +55 @@
                 flag = True
             ptype.deleteActions(idxs)
-            logger.log(logging.INFO, "Moved \"SEO Properties\" action from %s type in portal actions." % ptype.id)
+            logger.log(logging.INFO, "Moved \"SEO Properties\" action from %s "
+                       "type in portal actions." % ptype.id)
     if flag:
         seoprops_tool.manage_changeProperties(content_types_with_seoproperties=ctws)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/util.py

@@ -6 +6 @@
     from Globals import InitializeClass
 
-def createMultiColumnList(self,slist, numCols, sort_on='title_or_id'):
-    try:
-        mcl = self.createMultiColumnList(slist, numCols, sort_on=sort_on)
-        return mcl
-    except AttributeError:
-        return [slist]
 
 class SortedDict(dict):