RSS reader: restore socket default timeout

bt5/erp5_knowledge_pad/ExtensionTemplateItem/GetRssDataAsDict.py

@@ -16,13 +16,15 @@ def getRssDataAsDict(self, url, username=None, password=None):
     passman.add_password(None, url, username, password)
     auth_handler = urllib2.HTTPBasicAuthHandler(passman)
     handlers.append(auth_handler)
-  
+
   # set shorter timeouts and revert default at enf of read  
   default_timeout = socket.getdefaulttimeout()
   socket.setdefaulttimeout(60.0)
-  d = feedparser.parse(url, handlers=handlers)  
-  socket.setdefaulttimeout(default_timeout)    
-  
+  try:
+    d = feedparser.parse(url, handlers=handlers)
+  finally:
+    socket.setdefaulttimeout(default_timeout)
+
   if d.bozo and isinstance(d.bozo_exception, urllib2.URLError):
     # we have an URL error
     return {'status':-2}
@@ -33,9 +35,7 @@ def getRssDataAsDict(self, url, username=None, password=None):
     return {'status':-3}
   elif d.status == 404:
     return {'status':-4}
-  
 
-  
   result['items'] = []
   # some feeds may not provide logo
   if d.feed.get('image', None) is not None:

bt5/erp5_knowledge_pad/bt/revision

-764
+765
\ No newline at end of file