[Checkins] SVN: lovely.responsecache/trunk/ - make _purgeURLS method more robust (must not raise an exception)

[Juergen Kartnaller]

Log message for revision 83608:
  - make _purgeURLS method more robust (must not raise an exception)
  
  

Changed:
  U   lovely.responsecache/trunk/CHANGES.txt
  U   lovely.responsecache/trunk/src/lovely/responsecache/purge.py

-=-
Modified: lovely.responsecache/trunk/CHANGES.txt
===================================================================
--- lovely.responsecache/trunk/CHANGES.txt	2008-02-07 10:10:49 UTC (rev 83607)
+++ lovely.responsecache/trunk/CHANGES.txt	2008-02-07 15:54:12 UTC (rev 83608)
@@ -2,6 +2,11 @@
 Changes for lovely.responsecache
 ================================
 
+2008/02/07 0.4.2
+================
+
+- make _purgeURLS method more robust (must not raise an exception)
+
 2008/01/29 0.4.1
 ================
 

Modified: lovely.responsecache/trunk/src/lovely/responsecache/purge.py
===================================================================
--- lovely.responsecache/trunk/src/lovely/responsecache/purge.py	2008-02-07 10:10:49 UTC (rev 83607)
+++ lovely.responsecache/trunk/src/lovely/responsecache/purge.py	2008-02-07 15:54:12 UTC (rev 83608)
@@ -87,8 +87,10 @@
 
     def _purgeURLs(self, urls):
         import pycurl
+        result = True
+        url = 'no URL'
+        c = pycurl.Curl()
         try:
-            c = pycurl.Curl()
             c.setopt(c.WRITEFUNCTION, self.ignoreWrite)
             c.setopt(c.CUSTOMREQUEST,'PURGE')
             c.setopt(c.TIMEOUT, self.timeout)
@@ -96,11 +98,11 @@
                 c.setopt(c.URL, url)
                 c.perform()
                 log.info('purged %r' % url)
-            c.close()
-            return True
         except Exception, e:
             log.error('unable to purge %r, reason: %s' % (url, e))
-            return False
+            result = False
+        c.close()
+        return result
 
     def ignoreWrite(self, data):
         pass