From 550cba60027e640d179156b7061ba51a57501021 Mon Sep 17 00:00:00 2001 From: Josh Roesslein Date: Thu, 15 Oct 2009 18:13:02 -0500 Subject: [PATCH] Some more python 2.4 porting. --- tweepy/binder.py | 10 +++++----- tweepy/parsers.py | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tweepy/binder.py b/tweepy/binder.py index ed85718..ca13a1f 100644 --- a/tweepy/binder.py +++ b/tweepy/binder.py @@ -92,7 +92,7 @@ def bind_api(path, parser, allowed_param=[], method='GET', require_auth=False, _host = host or api.host # Continue attempting request until successful - # or maxium number of retries is reached. + # or maximum number of retries is reached. retries_performed = 0 while retries_performed < retry_count + 1: # Open connection @@ -140,8 +140,8 @@ def bind_api(path, parser, allowed_param=[], method='GET', require_auth=False, # Parse json respone body try: jobject = json.loads(resp.read()) - except Exception: - raise TweepError("Failed to parse json response text") + except Exception, e: + raise TweepError("Failed to parse json: %s" % e) # Parse cursor infomation if isinstance(jobject, dict): @@ -157,8 +157,8 @@ def bind_api(path, parser, allowed_param=[], method='GET', require_auth=False, out = parser(jobject, api), next_cursor, prev_cursor else: out = parser(jobject, api) - except Exception: - raise TweepError("Failed to parse json object") + except Exception, e: + raise TweepError("Failed to parse response: %s" % e) conn.close() diff --git a/tweepy/parsers.py b/tweepy/parsers.py index 9ae097e..e2d76a5 100644 --- a/tweepy/parsers.py +++ b/tweepy/parsers.py @@ -5,6 +5,7 @@ import htmlentitydefs import re from datetime import datetime +import time from tweepy.models import models @@ -34,12 +35,14 @@ def parse_error(obj): def _parse_datetime(str): - return datetime.strptime(str, '%a %b %d %H:%M:%S +0000 %Y') + # We must parse datetime this way to work in python 2.4 + return datetime(*(time.strptime(str, '%a %b %d %H:%M:%S +0000 %Y')[0:6])) def _parse_search_datetime(str): - return datetime.strptime(str, '%a, %d %b %Y %H:%M:%S +0000') + # python 2.4 + return datetime(*(time.strptime(str, '%a, %d %b %Y %H:%M:%S +0000')[0:6])) def unescape_html(text): -- 2.25.1