Merge lp:~cjwatson/lazr.restfulclient/no-py25 into lp:lazr.restfulclient

[Colin Watson]

Drop support for Python < 2.6.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2020-01-27 13:29:16 +0000
+++ NEWS.rst	2021-01-18 23:11:49 +0000
@@ -2,6 +2,11 @@
 NEWS for lazr.restfulclient
 ===========================
 
+0.14.4
+======
+
+  - Drop support for Python < 2.6.
+
 0.14.3 (2020-01-27)
 ===================
 

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py	2018-11-17 13:16:44 +0000
+++ src/lazr/restfulclient/_browser.py	2021-01-18 23:11:49 +0000
@@ -33,6 +33,8 @@
 import atexit
 import errno
 from hashlib import md5
+from io import BytesIO
+from json import dumps
 import os
 import re
 import shutil
@@ -50,17 +52,6 @@
 except ImportError:
     from httplib2 import ProxyInfo
     proxy_info_from_environment = ProxyInfo.from_environment
-try:
-    # Python 3 and sufficiently modern Python 2 versions.
-    from json import dumps
-except ImportError:
-    from simplejson import dumps
-
-try:
-    # Python 3.
-    from io import BytesIO
-except ImportError:
-    from cStringIO import StringIO as BytesIO
 
 try:
     # Python 3.

=== modified file 'src/lazr/restfulclient/_json.py'
--- src/lazr/restfulclient/_json.py	2012-06-04 19:54:58 +0000
+++ src/lazr/restfulclient/_json.py	2021-01-18 23:11:49 +0000
@@ -22,12 +22,7 @@
 __all__ = ['DatetimeJSONEncoder']
 
 import datetime
-
-try:
-    # Python 3 and sufficiently modern Python 2 versions.
-    from json import JSONEncoder
-except ImportError:
-    from simplejson import JSONEncoder
+from json import JSONEncoder
 
 
 class DatetimeJSONEncoder(JSONEncoder):

=== modified file 'src/lazr/restfulclient/resource.py'
--- src/lazr/restfulclient/resource.py	2015-04-22 20:37:26 +0000
+++ src/lazr/restfulclient/resource.py	2021-01-18 23:11:49 +0000
@@ -29,22 +29,9 @@
     ]
 
 
-try:
-    from email.message import Message
-except ImportError:
-    from email.Message import Message
-
-try:
-    # Python 3 and sufficiently modern Python 2 versions.
-    from json import dumps, loads
-except ImportError:
-    from simplejson import dumps, loads
-
-try:
-    # Python 3.
-    from io import BytesIO
-except ImportError:
-    from cStringIO import StringIO as BytesIO
+from email.message import Message
+from io import BytesIO
+from json import dumps, loads
 
 try:
     # Python 3.