wrap v3 specific code with try blocks to work in v2

bear · bear · commit 36115a7a05a6 · 2015-11-14T16:01:55.000-05:00
diff --git a/twitter/_file_cache.py b/twitter/_file_cache.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 import errno
 import os
diff --git a/twitter/api.py b/twitter/api.py
@@ -20,10 +20,6 @@
 """A library that provides a Python interface to the Twitter API"""
 from __future__ import division
 from __future__ import print_function
-from builtins import map
-from builtins import str
-from builtins import range
-from builtins import object
 
 import base64
 from calendar import timegm
@@ -33,24 +29,25 @@
 import sys
 import textwrap
 import types
-import urllib.request
-import urllib.error
-import urllib.parse
 import requests
 from requests_oauthlib import OAuth1
 import io
 
+try:
+  #python 3
+  from urllib.parse import urlparse, urlunparse, urlencode
+  from urllib.request import urlopen
+  from urllib.request import __version__ as urllib_version
+except ImportError:
+  from urlparse import urlparse, urlunparse
+  from urllib2 import urlopen
+  from urllib import urlencode
+  from urllib import __version__ as urllib_version
+
 from twitter import (__version__, _FileCache, json, DirectMessage, List,
                      Status, Trend, TwitterError, User, UserStatus)
 from twitter.category import Category
 
-try:
-  # python 3
-  urllib_version = urllib.request.__version__
-except AttributeError:
-  # python 2
-  urllib_version = urllib.__version__
-
 CHARACTER_LIMIT = 140
 
 # A singleton representing a lazily instantiated FileCache.
@@ -995,7 +992,7 @@ def PostMedia(self,
         data = {'status': status}
         if not hasattr(media, 'read'):
             if media.startswith('http'):
-                data['media'] = urllib.request.urlopen(media).read()
+                data['media'] = urlopen(media).read()
             else:
                 with open(str(media), 'rb') as f:
                     data['media'] = f.read()
@@ -1068,7 +1065,7 @@ def PostMultipleMedia(self, status, media, possibly_sensitive=None,
             data = {}
             if not hasattr(media[m], 'read'):
                 if media[m].startswith('http'):
-                    data['media'] = urllib.request.urlopen(media[m]).read()
+                    data['media'] = urlopen(media[m]).read()
                 else:
                     data['media'] = open(str(media[m]), 'rb').read()
             else:
@@ -3679,7 +3676,7 @@ def GetSleepTime(self, resources):
 
     def _BuildUrl(self, url, path_elements=None, extra_params=None):
         # Break url into constituent parts
-        (scheme, netloc, path, params, query, fragment) = urllib.parse.urlparse(url)
+        (scheme, netloc, path, params, query, fragment) = urlparse(url)
 
         # Add any additional path elements to the path
         if path_elements:
@@ -3699,7 +3696,7 @@ def _BuildUrl(self, url, path_elements=None, extra_params=None):
                 query = extra_query
 
         # Return the rebuilt URL
-        return urllib.parse.urlunparse((scheme, netloc, path, params, query, fragment))
+        return urlunparse((scheme, netloc, path, params, query, fragment))
 
     def _InitializeRequestHeaders(self, request_headers):
         if request_headers:
@@ -3745,7 +3742,7 @@ def _EncodeParameters(self, parameters):
         if parameters is None:
             return None
         else:
-            return urllib.parse.urlencode(dict([(k, self._Encode(v)) for k, v in list(parameters.items()) if v is not None]))
+            return urlencode(dict([(k, self._Encode(v)) for k, v in list(parameters.items()) if v is not None]))
 
     def _EncodePostData(self, post_data):
         """Return a string in key=value&key=value form.
@@ -3764,7 +3761,7 @@ def _EncodePostData(self, post_data):
         if post_data is None:
             return None
         else:
-            return urllib.parse.urlencode(dict([(k, self._Encode(v)) for k, v in list(post_data.items())]))
+            return urlencode(dict([(k, self._Encode(v)) for k, v in list(post_data.items())]))
 
     def _ParseAndCheckTwitter(self, json_data):
         """Try and parse the JSON returned from Twitter and return
diff --git a/twitter/direct_message.py b/twitter/direct_message.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from builtins import object
-
 from calendar import timegm
 
 try:
diff --git a/twitter/hashtag.py b/twitter/hashtag.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 
diff --git a/twitter/list.py b/twitter/list.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 from twitter import json, TwitterError, User
diff --git a/twitter/parse_tweet.py b/twitter/parse_tweet.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 import re
diff --git a/twitter/status.py b/twitter/status.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 from __future__ import division
-from builtins import object
 from calendar import timegm
 
 try:
diff --git a/twitter/trend.py b/twitter/trend.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 from twitter import TwitterError
diff --git a/twitter/url.py b/twitter/url.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 from twitter import TwitterError  # import not used
diff --git a/twitter/user.py b/twitter/user.py
@@ -1,4 +1,3 @@
-from builtins import object
 #!/usr/bin/env python
 
 from twitter import json, TwitterError  # TwitterError not used

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from builtins import object`
`2`	`1`	`#!/usr/bin/env python`
`3`	`2`	`import errno`
`4`	`3`	`import os`