adding one second rul shortening tolerance and its tests

Author: Claudio

bitly.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import simplejson
-import urllib,urllib2
+import urllib, urllib2
 import urlparse
 import string
 
@@ -118,38 +118,40 @@ def setUrllib(self, urllib):
     def _getURL(self, verb, paramVal, more_params={}): 
         if not isinstance(paramVal, list):
             paramVal = [paramVal]
-              
+        
         params = {
                   'version':BITLY_API_VERSION,
                   'format':'json',
                   'login':self.login,
                   'apiKey':self.apikey,
             }
-
+            
         params.update(more_params)
         params = params.items() 
 
         verbParam = VERBS_PARAM[verb]   
         if verbParam:
             for val in paramVal:
-                params.append(( verbParam,val ))
-   
+                params.append(( verbParam, val ))
+            
         encoded_params = urllib.urlencode(params)
-        return "%s%s?%s" % (BITLY_BASE_URL,verb,encoded_params)
+        return "%s%s?%s" % (BITLY_BASE_URL, verb, encoded_params)
 
     def _fetchUrl(self, url):
         '''Fetch a URL
-    
+            
         Args:
           url: The URL to retrieve
-    
+            
         Returns:
           A string containing the body of the response.
         '''
-    
+        
         # Open and return the URL 
-        url_data = self._urllib.urlopen(url).read()
-        return url_data    
+        
+        url_data = self._urllib.urlopen(url=url, timeout=1).read()
+        return url_data
+        
 
     @classmethod
     def _CheckForError(cls, data):
@@ -184,7 +186,7 @@ def __init__(self,user_clicks=None,total_clicks=None):
     @staticmethod
     def NewFromJsonDict(data):
         '''Create a new instance based on a JSON dict.
-    
+        
         Args:
           data: A JSON dict, as converted from the JSON in the bitly API
         Returns:

test/test_shortening_urls.py

@@ -2,10 +2,11 @@
 #-*- coding:utf-8 -*-
 
 from nose.tools import assert_raises
+from urllib2 import URLError
 from mox import Mox
 
 import bitly
-
+from bitly import urllib2
 
 def test_urls_shortening_scenario_for_plain_urls():
     api = bitly.Api(login='jcfigueiredo', apikey='R_1cf5dc0fa14c2df34261fb620bd256aa')
@@ -95,4 +96,24 @@ def verifying_invalid_item():
     }
     assert_raises(bitly.BitlyError, bitly.Api._CheckForError, invalid_data)
 
-  
+
+def test_checking_for_timeout():
+    api = bitly.Api(login='jcfigueiredo', apikey='R_1cf5dc0fa14c2df34261fb620bd256aa')
+    yield verifying_the_the_original_url_return_on_timeout, api
+
+def verifying_the_the_original_url_return_on_timeout(api):
+    mox = Mox()
+    
+    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'))
+    
+    url_to_be_shortened = 'http://www.matandorobosgigantes.com'
+    
+    try:
+        mox.ReplayAll()
+        assert_raises(URLError, api.shorten, url_to_be_shortened)
+        mox.VerifyAll()
+    except Exception:
+        mox.UnsetStubs()