Merge bug. oops.

diff --git a/twitter/api.py b/twitter/api.py
index 3792826f02f4f5ef7144dbf87272da7427a2b08c..6abdd97ab5783bd148311cb2cd271e97a70b823b 100644 (file)
--- 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: