From: Josh Roesslein <jroesslein@gmail.com>
Date: Mon, 10 Aug 2009 16:37:46 +0000 (-0500)
Subject: Fix some python 2.5 errors.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=be760fc708f0e26bcb5010340f78058034882cb6;p=tweepy.git

Fix some python 2.5 errors.
---

diff --git a/README b/README
index 6b28470..8a4a4e0 100644
--- a/README
+++ b/README
@@ -22,6 +22,7 @@ Getting started:
 Author: Joshua Roesslein
 License: MIT
 Dependencies:
+  Python 2.5+
   Simplejson <http://undefined.org/python/#simplejson>
     **Included in python 2.6+
   Python-OAuth <http://code.google.com/p/oauth>
diff --git a/tweepy/binder.py b/tweepy/binder.py
index 1eb78bf..028324b 100644
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -67,9 +67,9 @@ def bind_api(path, parser, allowed_param=None, method='GET', require_auth=False,
 
     # Open connection
     if api.secure:
-      conn = httplib.HTTPSConnection(_host, timeout=10)
+      conn = httplib.HTTPSConnection(_host)
     else:
-      conn = httplib.HTTPConnection(_host, timeout=10)
+      conn = httplib.HTTPConnection(_host)
 
     # Build request
     conn.request(method, url, headers=headers)
diff --git a/tweepy/cache.py b/tweepy/cache.py
index 98e821a..e7f9e05 100644
--- a/tweepy/cache.py
+++ b/tweepy/cache.py
@@ -2,6 +2,8 @@
 # Copyright 2009 Joshua Roesslein
 # See LICENSE
 
+from __future__ import with_statement
+
 import time
 import threading
 import os