From 29472463ba601e9c0513eadb19470e435b2601a1 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 11 Oct 2011 09:24:07 -0700 Subject: [PATCH] Work around Python 2.7 failure to initialize base class urllib2 returns a malformed HTTPError object in certain situations. For example, urllib2 has a couple of places where it creates an HTTPError object with no fp: if self.retried > 5: # retry sending the username:password 5 times before failing. raise HTTPError(req.get_full_url(), 401, "basic auth failed", headers, None) When it does that, HTTPError's ctor doesn't call through to addinfourl's ctor: # The addinfourl classes depend on fp being a valid file # object. In some cases, the HTTPError may not have a valid # file object. If this happens, the simplest workaround is to # not initialize the base classes. if fp is not None: self.__super_init(fp, hdrs, url, code) Which means the 'headers' slot in addinfourl is not initialized and info() fails. It is completely insane that urllib2 decides not to initialize its own base class sometimes. Change-Id: I32a0d738f71bdd7d38d86078b71d9001e26f1ec3 Signed-off-by: Shawn O. Pearce --- project.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project.py b/project.py index 43f4713c..76d4d0d5 100644 --- a/project.py +++ b/project.py @@ -1465,10 +1465,16 @@ class Project(object): try: r = urllib2.urlopen(req) except urllib2.HTTPError, e: + def _content_type(): + try: + return e.info()['content-type'] + except: + return None + if e.code == 404: keep = False return False - elif e.info()['content-type'] == 'text/plain': + elif _content_type() == 'text/plain': try: msg = e.read() if len(msg) > 0 and msg[-1] == '\n':