From: Mike Verdone <redacted>
Date: Wed, 2 Mar 2011 21:59:42 +0000 (+0100)
Subject: Merge bug. oops.
X-Git-Tag: twitter-1.5.1^0
X-Git-Url: https://jfr.im/git/z_archive/twitter.git/commitdiff_plain/8eba5b42f7d2fdb38b6774e7067bc47fbda38699

Merge bug. oops.
---

diff --git a/twitter/api.py b/twitter/api.py
index 3792826..6abdd97 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -154,7 +154,7 @@ class TwitterCall(object):
             else:
                 return wrap_response(
                     handle.read().decode('utf8'), handle.headers)
-        except urllib.HTTPError as e:
+        except urllib2.HTTPError as e:
             if (e.code == 304):
                 return []
             else: