Skip to content

Commit eed3358

Browse files
valeriansaliouvaleriansaliou
committed
v1.1.4
1 parent b5ec0f9 commit eed3358

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

‎get_access_token.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616

1717
# parse_qsl moved to urlparse module in v2.6
1818
try:
19-
from urlparse import parse_qsl
19+
from urllib.parse import parse_qsl
2020
except:
21-
from cgi import parse_qsl
21+
try:
22+
from urlparse import parse_qsl
23+
except:
24+
from cgi import parse_qsl
2225

2326
import webbrowser
2427
import oauth2 as oauth

‎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.3'
20+
__version__ = '1.1.4'
2121

2222

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

‎twitter.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@
2727
except ImportError:
2828
import email
2929

30+
try:
31+
import urlparse
32+
except ImportError:
33+
import urllib.parse as urlparse
34+
3035
import os
3136
import urllib
3237
import sys
3338
import tempfile
3439
import textwrap
3540
import time
36-
import urlparse
3741
import gzip
3842
import StringIO
3943
import re

0 commit comments

Comments
 (0)