replacing default http engine for httplib2

Author: Claudio

bitly.py

@@ -14,11 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = '0.2'
+VERSION = '0.3'
 __version__ = VERSION
 
 import simplejson
-import urllib, urllib2
+import urllib
+import httplib2
 import socket
 from urllib2 import URLError
 import urlparse
@@ -66,7 +67,7 @@ def get_api_domain(self):
     def __init__(self, login, apikey, domain=None):
         self.login = login
         self.apikey = apikey
-        self._urllib = urllib2
+        self._urllib = httplib2
         if domain is not None:
             self.domain = domain
 
@@ -136,7 +137,7 @@ def setUrllib(self, urllib):
         '''Override the default urllib implementation.
     
         Args:
-          urllib: an instance that supports the same API as the urllib2 module
+          urllib or httplib2
         '''
         self._urllib = urllib
 
@@ -174,13 +175,17 @@ def _fetchUrl(self, url):
 
         # Open and return the URL 
         try:
-
-            socket.setdefaulttimeout(TIMEOUT);
-            url_data = self._urllib.urlopen(url=url).read()
-        except URLError, err:
+            if self._urllib is httplib2:
+                http = httplib2.Http(timeout=TIMEOUT)
+                resp, content = http.request(url)
+                url_data = content
+            else:
+                url_data = self._urllib.urlopen(url=url).read()
+                
+        except (URLError, socket.error), err:
             # nasty bit of hack, i know but unfortunatly urllib2 has no smart way of telling me 
             # that it was an timeout error
-            if err.reason == 'urlopen error timed out':
+            if hasattr(err,'reason') and err.reason == 'urlopen error timed out' or unicode(err) == u'timed out':
                 raise BitlyTimeoutError('The url %s has timed out' % url)
             raise err
 

setup.py

@@ -15,6 +15,7 @@
     py_modules=['bitly'],
     install_requires=[
         'simplejson',
+        'httplib2'
     ],
 )
 

test/test_shortening_urls.py

@@ -6,7 +6,7 @@
 from mox import Mox
 
 import bitly
-from bitly import urllib2
+from bitly import httplib2
 
 def test_urls_shortening_scenario_for_plain_urls():
     api = bitly.Api(login='jcfigueiredo', apikey='R_1cf5dc0fa14c2df34261fb620bd256aa')
@@ -108,8 +108,8 @@ def verifying_that_a_custom_exception_is_raised_on_timeout(api):
 
     bitly_shortening_url = 'http://api.bit.ly/shorten?login=jcfigueiredo&version=2.0.1&apiKey=R_1cf5dc0fa14c2df34261fb620bd256aa&format=json&longUrl=http%3A%2F%2Fwww.matandorobosgigantes.com'
 
-    mox.StubOutWithMock(urllib2, "urlopen")
-    urllib2.urlopen(url=bitly_shortening_url).AndRaise(URLError('urlopen error timed out'))
+    mox.StubOutWithMock(httplib2.Http, "request")
+    httplib2.Http.request(bitly_shortening_url).AndRaise(URLError('urlopen error timed out'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'
 
@@ -125,8 +125,8 @@ def verifying_that_urlerror_exceptions_are_reraised_but_timeout_exceptions(api):
 
     bitly_shortening_url = 'http://api.bit.ly/shorten?login=jcfigueiredo&version=2.0.1&apiKey=R_1cf5dc0fa14c2df34261fb620bd256aa&format=json&longUrl=http%3A%2F%2Fwww.matandorobosgigantes.com'
 
-    mox.StubOutWithMock(urllib2, "urlopen")
-    urllib2.urlopen(url=bitly_shortening_url).AndRaise(URLError('something different from timeout'))
+    mox.StubOutWithMock(httplib2.Http, "request")
+    httplib2.Http.request(bitly_shortening_url).AndRaise(URLError('something different from timeout'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'
 
@@ -142,8 +142,8 @@ def verifying_that_any_other_exceptions_are_reraised_but_timeout_exceptions(api)
 
     bitly_shortening_url = 'http://api.bit.ly/shorten?login=jcfigueiredo&version=2.0.1&apiKey=R_1cf5dc0fa14c2df34261fb620bd256aa&format=json&longUrl=http%3A%2F%2Fwww.matandorobosgigantes.com'
 
-    mox.StubOutWithMock(urllib2, "urlopen")
-    urllib2.urlopen(url=bitly_shortening_url).AndRaise(ValueError('something different'))
+    mox.StubOutWithMock(httplib2.Http, "request")
+    httplib2.Http.request(bitly_shortening_url).AndRaise(ValueError('something different'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'