Minor cleaning up of the new read code

[doneit] / src / rtm_api.py

diff --git a/src/rtm_api.py b/src/rtm_api.py
index e53009b..a184328 100644 (file)
--- a/src/rtm_api.py
+++ b/src/rtm_api.py
@@ -9,7 +9,8 @@ import weakref
 import warnings
 import urllib
 import urllib2
-from md5 import md5
+import hashlib
+import time
 
 _use_simplejson = False
 try:
@@ -81,7 +82,7 @@ class RTMapi(object):
        def _sign(self, params):
                "Sign the parameters with MD5 hash"
                pairs = ''.join(['%s%s' % (k, v) for (k, v) in sortedItems(params)])
-               return md5(self._secret+pairs).hexdigest()
+               return hashlib.md5(self._secret+pairs).hexdigest()
 
        @staticmethod
        def open_url(url, queryArgs=None):
@@ -90,6 +91,66 @@ class RTMapi(object):
                warnings.warn("Performing download of %s" % url, stacklevel=5)
                return urllib2.urlopen(url)
 
+       @staticmethod
+       def read_by_length(connection, timeout):
+               # It appears that urllib uses the non-blocking variant of file objects
+               # which means reads might not always be complete, so grabbing as much
+               # of the data as possible with a sleep in between to give it more time
+               # to grab data.
+               contentLengthField = "Content-Length"
+               assert contentLengthField in connection.info(), "Connection didn't provide content length info"
+               specifiedLength = int(connection.info()["Content-Length"])
+
+               actuallyRead = 0
+               chunks = []
+
+               chunk = connection.read()
+               actuallyRead += len(chunk)
+               chunks.append(chunk)
+               while 0 < timeout and actuallyRead < specifiedLength:
+                       time.sleep(1)
+                       timeout -= 1
+                       chunk = connection.read()
+                       actuallyRead += len(chunk)
+                       chunks.append(chunk)
+
+               json = "".join(chunks)
+
+               if "Content-Length" in connection.info():
+                       assert len(json) == int(connection.info()["Content-Length"]), "The packet header promised %s of data but only was able to read %s of data" % (
+                               connection.info()["Content-Length"],
+                               len(json),
+                       )
+
+               return json
+
+       @staticmethod
+       def read_by_guess(connection, timeout):
+               # It appears that urllib uses the non-blocking variant of file objects
+               # which means reads might not always be complete, so grabbing as much
+               # of the data as possible with a sleep in between to give it more time
+               # to grab data.
+
+               chunks = []
+
+               chunk = connection.read()
+               chunks.append(chunk)
+               while chunk and 0 < timeout:
+                       time.sleep(1)
+                       timeout -= 1
+                       chunk = connection.read()
+                       chunks.append(chunk)
+
+               json = "".join(chunks)
+
+               if "Content-Length" in connection.info():
+                       assert len(json) == int(connection.info()["Content-Length"]), "The packet header promised %s of data but only was able to read %s of data" % (
+                               connection.info()["Content-Length"],
+                               len(json),
+                       )
+
+               return json
+
        def get(self, **params):
                "Get the XML response for the passed `params`."
                params['api_key'] = self._apiKey
@@ -97,7 +158,9 @@ class RTMapi(object):
                params['api_sig'] = self._sign(params)
 
                connection = self.open_url(SERVICE_URL, params)
-               json = connection.read()
+               json = self.read_by_guess(connection, 5)
+               # json = self.read_by_length(connection, 5)
+
                data = DottedDict('ROOT', parse_json(json))
                rsp = data.rsp
 
@@ -212,6 +275,9 @@ def safer_eval(string):
        try:
                return eval(string, {}, {})
        except SyntaxError, e:
+               print "="*60
+               print string
+               print "="*60
                newE = RTMParseError("Error parseing json")
                newE.error = e
                raise newE