Changeset 2929 in products

Timestamp:

Oct 26, 2010 2:55:15 PM (13 years ago)

Author:

mylan

Message:

#233: Make code more readable

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/keywords.py (modified) (4 diffs)

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

@@ -38 +38 @@
         if isExternal:
             # Not pass timeout option because:
-            # 1. its value get from the global default timeout settings by default.
+            # 1. its value get from the global default timeout settings.
             # 2. timeout option added in python 2.6 (so acceptable only in plone4+)
             try:
@@ -45 +45 @@
                     html = resp.read()
                 finally:
-                    'resp' in locals().keys() and resp.close()
+                    if 'resp' in locals().keys():
+                        resp.close()
             except (urllib2.URLError, urllib2.HTTPError), e:
                 # In case of exceed timeout period or other URL connection errors.
@@ -58 +59 @@
         # If no html - information about problem with page retrieval should be returned
         result = []
-        if html is not None:
+        if html is None:
+            sfx = error_url and ", details at %s." % error_url or "."
+            result.append("Problem with page retrieval" + sfx)
+        else:
             page_text = transforms.convert("html_to_text", html).getData()
             # check every keyword on appearing in body of html page
@@ -64 +68 @@
                 keyword_on_page = unicode(len(re.findall(u'\\b%s\\b' % keyword, page_text, re.I|re.U)))
                 result.append(' - '.join((keyword, keyword_on_page)))
-        else:
-            sfx = error_url and ", details at %s." % error_url or "."
-            result.append("Problem with page retrieval" + sfx)
 
         return ts.utranslate(domain='quintagroup.seoptimizer',