Some python 2.5 fixes.

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index d3d67d95efff6b8075c70c5c3d1805b630c90772..3d70bfaa631ccc3fe979914df0a221197d911662 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -7,10 +7,10 @@ Tweepy Twitter API library
 """
 __version__ = '1.0'
 
-from . models import *
+from . models import Status, User, DirectMessage, Friendship, SavedSearch, SearchResult, models
 from . error import TweepError
 from . api import API
-from . cache import *
+from . cache import Cache, MemoryCache, FileCache, MemCache
 from . auth import BasicAuthHandler, OAuthHandler
 from . streaming import Stream
 

diff --git a/tweepy/api.py b/tweepy/api.py
index 03cd2dc3f5c7c8a82538b14ff0c9b978ac9b0017..115b65d27ee1bbd3fe3bd431002a568927495fe2 100644 (file)
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@ -6,9 +6,9 @@ import os
 import mimetypes
 
 from . binder import bind_api
-from . parsers import *
 from . error import TweepError
 from . auth import BasicAuthHandler, OAuthHandler
+from tweepy.parsers import *
 
 """Twitter API"""
 class API(object):
@@ -421,6 +421,8 @@ class API(object):
         parser = parse_trend_results
     )(self)
 
+
+""" Pack image file into multipart-formdata request"""
 def _pack_image(filename, max_size):
   """Pack image from file into multipart-formdata post body"""
   # image must be less than 700kb in size

diff --git a/tweepy/binder.py b/tweepy/binder.py
index 9fe2432ee1416b41d134615afca349807065a030..0c2ce4295585d86fa151b92ff4b4f334dca2fa86 100644 (file)
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -75,10 +75,11 @@ def bind_api(path, parser, allowed_param=None, method='GET', require_auth=False,
         return cache_result
 
     # Open connection
+    # FIXME: add timeout
     if api.secure:
-      conn = httplib.HTTPSConnection(_host, timeout=10.0)
+      conn = httplib.HTTPSConnection(_host)
     else:
-      conn = httplib.HTTPConnection(_host, timeout=10.0)
+      conn = httplib.HTTPConnection(_host)
 
     # Build request
     conn.request(method, url, headers=headers, body=post_data)