[Checkins] SVN: lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py added try/except around the retry section

Adam Groszer agroszer at gmail.com
Mon Mar 17 06:09:55 EDT 2008


Log message for revision 84735:
  added try/except around the retry section

Changed:
  U   lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py

-=-
Modified: lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py
===================================================================
--- lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py	2008-03-17 09:57:51 UTC (rev 84734)
+++ lovely.buildouthttp/trunk/src/lovely/buildouthttp/buildouthttp.py	2008-03-17 10:09:54 UTC (rev 84735)
@@ -26,16 +26,24 @@
 
     def http_error_401(self, req, fp, code, msg, headers):
         log.debug('getting url: %r' % req.get_full_url())
-        res =  urllib2.HTTPBasicAuthHandler.http_error_401(self,req, fp, code,
+        try:
+            res =  urllib2.HTTPBasicAuthHandler.http_error_401(self,req, fp, code,
                                                            msg,
                                                            headers)
-        if res is None:
-            log.error('failed to get url: %r, check your realm' % res.url)
-        elif res.code>=400:
-            log.error('failed to get url: %r %r' % (res.url, res.code))
+        except urllib2.HTTPError, err:
+            log.error('failed to get url: %r %r' % (req.get_full_url(), err.code))
+            raise
+        except Exception, err:
+            log.error('failed to get url: %r %s' % (req.get_full_url(), str(err)))
+            raise
         else:
-            log.debug('got url: %r %r' % (res.url, res.code))
-        return res
+            if res is None:
+                log.error('failed to get url: %r, check your realm' % res.url)
+            elif res.code>=400:
+                log.error('failed to get url: %r %r' % (res.url, res.code))
+            else:
+                log.debug('got url: %r %r' % (res.url, res.code))
+            return res
 
 def install(buildout=None):
     try:



More information about the Checkins mailing list