repos/twython
1
Fork 0
Code Issues 23 Pull requests 4 Projects Releases 5 Packages Wiki Activity Actions

Python 3 compat

Browse source
This commit is contained in:
Mike Helmick 2013-05-24 16:17:50 -04:00
parent c8b1202880
commit 64b1349993
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test_twython.py
View file

@ -102,7 +102,7 @@ class TwythonAPITestCase(unittest.TestCase):
counter = 0 counter = 0
while counter < 2: while counter < 2:
counter += 1 counter += 1
result = search.next() result = next(search)
new_id_str = int(result['id_str']) new_id_str = int(result['id_str'])
if counter == 1: if counter == 1:
prev_id_str = new_id_str prev_id_str = new_id_str

8
twython/streaming/api.py
View file

@ -1,5 +1,5 @@
from .. import __version__ from .. import __version__
from ..compat import json from ..compat import json, is_py3
from ..exceptions import TwythonStreamError from ..exceptions import TwythonStreamError
from .types import TwythonStreamerTypes from .types import TwythonStreamerTypes
@ -93,7 +93,11 @@ class TwythonStreamer(object):
break break
if line: if line:
try: try:
self.on_success(json.loads(line)) if not is_py3:
self.on_success(json.loads(line))
else:
line = line.decode('utf-8')
self.on_success(json.loads(line))
except ValueError: except ValueError:
raise TwythonStreamError('Response was not valid JSON, \ raise TwythonStreamError('Response was not valid JSON, \
unable to decode.') unable to decode.')