minor fix for None results

stamparm · stamparm · commit 8fac4605a95f · 2011-06-10T22:28:15.000Z
diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py
@@ -48,19 +48,19 @@ def common_http_redirect(self, result, headers, code, content, msg):
 
         logger.log(7, responseMsg)
 
-        if "location" in headers:
-            result.redurl = headers.getheaders("location")[0].split("?")[0]
-        elif "uri" in headers:
-            result.redurl = headers.getheaders("uri")[0].split("?")[0]
+        if result:
+            if "location" in headers:
+                result.redurl = headers.getheaders("location")[0].split("?")[0]
+            elif "uri" in headers:
+                result.redurl = headers.getheaders("uri")[0].split("?")[0]
 
-        if hasattr(result, 'redurl'):
-            if not urlparse.urlsplit(result.redurl).netloc:
-                result.redurl = urlparse.urljoin(conf.url, result.redurl)
+            if hasattr(result, 'redurl'):
+                if not urlparse.urlsplit(result.redurl).netloc:
+                    result.redurl = urlparse.urljoin(conf.url, result.redurl)
 
-        if "set-cookie" in headers:
-            result.setcookie = headers["set-cookie"].split("; path")[0]
+            if "set-cookie" in headers:
+                result.setcookie = headers["set-cookie"].split("; path")[0]
 
-        if result:
             result.redcode = code
 
         return result
