Merge pull request tweepy#285.

joshthecoder · joshthecoder · commit a6008ecbefe4 · 2013-05-14T11:12:19.000-07:00
- Fix code style issue.
diff --git a/tweepy/api.py b/tweepy/api.py
@@ -17,7 +17,7 @@ class API(object):
     def __init__(self, auth_handler=None,
             host='api.twitter.com', search_host='search.twitter.com',
              cache=None, secure=True, api_root='/1.1', search_root='',
-            retry_count=0, retry_delay=0, retry_errors=None,
+            retry_count=0, retry_delay=0, retry_errors=None, timeout=60,
             parser=None):
         self.auth = auth_handler
         self.host = host
@@ -29,6 +29,7 @@ def __init__(self, auth_handler=None,
         self.retry_count = retry_count
         self.retry_delay = retry_delay
         self.retry_errors = retry_errors
+        self.timeout = timeout
         self.parser = parser or ModelParser()
 
     """ statuses/home_timeline """
diff --git a/tweepy/binder.py b/tweepy/binder.py
@@ -128,11 +128,10 @@ def execute(self):
             retries_performed = 0
             while retries_performed < self.retry_count + 1:
                 # Open connection
-                # FIXME: add timeout
                 if self.api.secure:
-                    conn = httplib.HTTPSConnection(self.host)
+                    conn = httplib.HTTPSConnection(self.host, timeout=self.api.timeout)
                 else:
-                    conn = httplib.HTTPConnection(self.host)
+                    conn = httplib.HTTPConnection(self.host, timeout=self.api.timeout)
 
                 # Apply authentication
                 if self.api.auth:
