X Tutup
Skip to content

Commit b3ad682

Browse files
committed
first pass at python v3 support
1 parent 9e4d4d1 commit b3ad682

File tree

11 files changed

+116
-105
lines changed

11 files changed

+116
-105
lines changed

twitter/__init__.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# limitations under the License.
1818

1919
"""A library that provides a Python interface to the Twitter API"""
20+
from __future__ import absolute_import
2021

2122
__author__ = 'python-twitter@googlegroups.com'
2223
__version__ = '2.3'
@@ -28,14 +29,14 @@
2829
except ImportError:
2930
from md5 import md5
3031

31-
from _file_cache import _FileCache
32-
from error import TwitterError
33-
from direct_message import DirectMessage
34-
from hashtag import Hashtag
35-
from parse_tweet import ParseTweet
36-
from trend import Trend
37-
from url import Url
38-
from status import Status
39-
from user import User, UserStatus
40-
from list import List
41-
from api import Api
32+
from ._file_cache import _FileCache
33+
from .error import TwitterError
34+
from .direct_message import DirectMessage
35+
from .hashtag import Hashtag
36+
from .parse_tweet import ParseTweet
37+
from .trend import Trend
38+
from .url import Url
39+
from .status import Status
40+
from .user import User, UserStatus
41+
from .list import List
42+
from .api import Api

twitter/_file_cache.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from builtins import object
12
#!/usr/bin/env python
23
from hashlib import md5
34
import os
@@ -63,7 +64,7 @@ def _GetUsername(self):
6364
os.getenv('USERNAME') or \
6465
os.getlogin() or \
6566
'nobody'
66-
except (AttributeError, IOError, OSError), e:
67+
except (AttributeError, IOError, OSError) as e:
6768
return 'nobody'
6869

6970
def _GetTmpCachePath(self):
@@ -96,11 +97,11 @@ def _GetPrefix(self, hashed_key):
9697
return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
9798

9899

99-
class ParseTweet:
100+
class ParseTweet(object):
100101
# compile once on import
101102
regexp = {"RT": "^RT", "MT": r"^MT", "ALNUM": r"(@[a-zA-Z0-9_]+)",
102103
"HASHTAG": r"(#[\w\d]+)", "URL": r"([http://]?[a-zA-Z\d\/]+[\.]+[a-zA-Z\d\/\.]+)"}
103-
regexp = dict((key, re.compile(value)) for key, value in regexp.items())
104+
regexp = dict((key, re.compile(value)) for key, value in list(regexp.items()))
104105

105106
def __init__(self, timeline_owner, tweet):
106107
""" timeline_owner : twitter handle of user account. tweet - 140 chars from feed; object does all computation on construction

0 commit comments

Comments
 (0)
X Tutup