Merge pull request #285.

- Fix code style issue.

diff --cc tweepy/api.py
Simple merge

diff --cc tweepy/binder.py
index 7817537c92daa423ea221450a7c4cee93e20d65c,c69e583326d6d45e10db03092716a0fc5919cd24..b4b91e67de1035cf85d694b33ff30bc479d11d8d
--- 1/tweepy/binder.py
--- 2/tweepy/binder.py
+++ b/tweepy/binder.py
@@@ -128,11 -128,10 +128,10 @@@ def bind_api(**config)
              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)
++                    conn = httplib.HTTPSConnection(self.host, timeout=self.api.timeout)
                  else:
-                     conn = httplib.HTTPConnection(self.host)
 -                    conn = httplib.HTTPConnection(self.host,timeout=self.api.timeout)
++                    conn = httplib.HTTPConnection(self.host, timeout=self.api.timeout)
  
                  # Apply authentication
                  if self.api.auth: