From: Joshua Roesslein <jroesslein@gmail.com>
Date: Tue, 14 May 2013 18:10:50 +0000 (-0700)
Subject: Merge pull request #285.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a6008ecbefe491678c780ef9424caf5134e69f90;p=tweepy.git

Merge pull request #285.

- Fix code style issue.
---

a6008ecbefe491678c780ef9424caf5134e69f90
diff --cc tweepy/binder.py
index 7817537,c69e583..b4b91e6
--- a/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: