diff --git a/twitter/__init__.py b/twitter/__init__.py index b483624..36f3084 100644 --- a/twitter/__init__.py +++ b/twitter/__init__.py @@ -28,7 +28,7 @@ __download_url__ = 'https://pypi.python.org/pypi/python-twitter' __description__ = 'A Python wrapper around the Twitter API' -import json # noqa +import json as simplejson # noqa try: from hashlib import md5 # noqa diff --git a/twitter/direct_message.py b/twitter/direct_message.py index 137b90c..fe7b36f 100644 --- a/twitter/direct_message.py +++ b/twitter/direct_message.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from calendar import timegm -import rfc822 +import rfc822py3 from twitter import simplejson, TwitterError diff --git a/twitter/models.py b/twitter/models.py index e8974eb..236cece 100644 --- a/twitter/models.py +++ b/twitter/models.py @@ -5,7 +5,7 @@ import json from calendar import timegm try: - from rfc822 import parsedate + from rfc822py3 import parsedate except ImportError: from email.utils import parsedate diff --git a/twitter/status.py b/twitter/status.py index 9ae7e13..fe92424 100644 --- a/twitter/status.py +++ b/twitter/status.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from calendar import timegm -import rfc822 +import rfc822py3 import time from twitter import simplejson, Hashtag, TwitterError, Url -- 2.24.1