Changeset 2932 in products

Timestamp:

Oct 26, 2010 5:35:28 PM (14 years ago)

Author:

mylan

Message:

#233: Force logging keywords calculation to nearest to context error_log object. Other minor fixes

File:

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

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

@@ -5 +5 @@
 from zope.component import getUtility
 from zope.component import queryAdapter
+
+from Acquisition import aq_acquire
 from Products.Five.browser import BrowserView
 
@@ -42 +44 @@
             # 2. timeout option added in python 2.6 (so acceptable only in plone4+)
             try:
+                resp = urllib2.urlopen(self.context.absolute_url())
                 try:
-                    resp = urllib2.urlopen(self.context.absolute_url())
                     html = resp.read()
                 finally:
-                    if 'resp' in locals().keys():
-                        resp.close()
+                    resp.close()
             except (urllib2.URLError, urllib2.HTTPError), e:
                 # In case of exceed timeout period or other URL connection errors.
+                # Get nearest to context error_log object (stolen from Zope2/App/startup.py)
+                html = None
                 info = sys.exc_info()
-                elog = getToolByName(self.context, "error_log")
-                if elog:
+                try:
+                    elog = aq_acquire(self.context, '__error_log__', containment=1)
+                except AttributeError:
+                    pass
+                else:
                     error_url = elog.raising(info)
-                html = None
         else:
             html = unicode(self.context()).encode(enc)
@@ -61 +66 @@
         result = []
         if html is None:
-            sfx = error_url and ", details at %s." % error_url or "."
-            result.append("Problem with page retrieval" + sfx)
+            result.append("Problem with page retrieval.")
+            if error_url:
+                result.append("Details at %s." % error_url)
         else:
             page_text = transforms.convert("html_to_text", html).getData()