Permalink
Browse files

Some python 2.5 fixes.

  • Loading branch information...
1 parent 098b5b5 commit 4b1d884ee8c4de6b4938fb2dcd5d55c48e972ac8 @joshthecoder joshthecoder committed Aug 19, 2009
Showing with 8 additions and 5 deletions.
  1. +2 −2 tweepy/__init__.py
  2. +3 −1 tweepy/api.py
  3. +3 −2 tweepy/binder.py
View
@@ -7,10 +7,10 @@
"""
__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
View
@@ -6,9 +6,9 @@
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 @@ def trends(self):
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
View
@@ -75,10 +75,11 @@ def _call(api, *args, **kargs):
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)

0 comments on commit 4b1d884

Please sign in to comment.