fixing compatibilty issues with python 2.5

Author: Claudio

bitly.py

@@ -171,7 +171,10 @@ def _fetchUrl(self, url):
 
         # Open and return the URL 
         try:
-            url_data = self._urllib.urlopen(url=url, timeout=1).read()
+            import socket
+            timeout =  1
+            socket.setdefaulttimeout(timeout);
+            url_data = self._urllib.urlopen(url=url).read()
         except URLError, err:
             # nasty bit of hack, i know but unfortunatly urllib2 has no smart way of telling me 
             # that it was an timeout error

test/test_shortening_urls.py

@@ -109,7 +109,7 @@ 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, timeout=1).AndRaise(URLError('urlopen error timed out'))
+    urllib2.urlopen(url=bitly_shortening_url).AndRaise(URLError('urlopen error timed out'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'
 
@@ -126,7 +126,7 @@ 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, timeout=1).AndRaise(URLError('something different from timeout'))
+    urllib2.urlopen(url=bitly_shortening_url).AndRaise(URLError('something different from timeout'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'
 
@@ -143,7 +143,7 @@ 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, timeout=1).AndRaise(ValueError('something different'))
+    urllib2.urlopen(url=bitly_shortening_url).AndRaise(ValueError('something different'))
 
     url_to_be_shortened = 'http://www.matandorobosgigantes.com'