Skip to content

Commit c6fea20

Browse files
v1.1.6
1 parent 835011b commit c6fea20

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'''The setup and build script for the python-twitter library.'''
1818

1919
__author__ = 'python-twitter@googlegroups.com'
20-
__version__ = '1.1.5'
20+
__version__ = '1.1.6'
2121

2222

2323
# The base package metadata to be used by both distutils and setuptools

twitter.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,25 @@
2323

2424

2525
try:
26+
# Python 2
2627
import rfc822
2728
except ImportError:
29+
# Python 3
2830
import email
2931

3032
try:
33+
# Python 2
3134
import urlparse
3235
except ImportError:
36+
# Python 3
3337
import urllib.parse as urlparse
3438

3539
try:
40+
# Python 2
3641
import StringIO
3742
except ImportError:
38-
import io.StringIO as StringIO
43+
# Python 3
44+
from io import StringIO
3945

4046
import os
4147
import urllib

0 commit comments

Comments
 (0)