Fix some python 2.5 errors.

diff --git a/README b/README
index 6b28470bf2ae7a430a647b0cdd39740e1179eccd..8a4a4e03bf2e67c406a03adcc55dbd7984c27359 100644 (file)
--- 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 1eb78bf1458c55bca72fa2e026816cff20314a5d..028324b9377f4131548d4a42f34595b37b4f1c62 100644 (file)
--- 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 98e821ad056302b3a052675da8ed9d80d37174b3..e7f9e050b97fb2d2138c275dc94d6f0cd5aeb106 100644 (file)
--- 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