Remove Python 2 support

Author: Alvaro Navarro

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 cache: pip
 python:
-  - '2.7'
   - '3.4'
   - '3.5'
   - '3.6.3' # explicit branch used for deploying

README.rst

@@ -11,7 +11,7 @@ Amadeus provides a rich set of APIs for the travel industry. For more details, c
 Installation
 ------------
 
-This SDK requires Python 2.7+ or 3.4+. You can install it directly with pip:
+This SDK requires Python 3.4+ (Python 2+ is no longer supported). You can install it directly with pip:
 
 .. code:: sh
 

amadeus/client/request.py

@@ -1,14 +1,9 @@
-# Support Python 2 and 3 API calls without importing
-# a 3rd party library
+# Support Python API calls without importing 3rd party library
 
 import json
 
-try:
-    from urllib.request import Request as HTTPRequest
-    from urllib.parse import urlencode
-except ImportError:  # pragma: no cover
-    from urllib2 import Request as HTTPRequest  # pragma: no cover
-    from urllib import urlencode  # pragma: no cover
+from urllib.request import Request as HTTPRequest
+from urllib.parse import urlencode
 
 
 class Request(object):

amadeus/mixins/http.py

@@ -1,9 +1,6 @@
 from platform import python_version
 from pprint import pformat
-try:
-    from urllib.error import URLError
-except ImportError:  # pragma: no cover
-    from urllib2 import Request as URLError  # pragma: no cover
+from urllib.error import URLError
 
 from amadeus.version import version
 from amadeus.client.request import Request

amadeus/mixins/validator.py

@@ -2,10 +2,7 @@
 import sys
 import logging
 
-try:
-    from urllib.request import urlopen
-except ImportError:  # pragma: no cover
-    from urllib2 import urlopen  # pragma: no cover
+from urllib.request import urlopen
 
 
 # A set of helper methods to allow the validating of

amadeus/shopping/flight_offers/_pricing.py

@@ -1,8 +1,6 @@
 from amadeus.client.decorator import Decorator
-try:
-    from urllib.parse import urlencode
-except ImportError:     # pragma: no cover
-    from urllib import urlencode    # pragma: no cover
+
+from urllib.parse import urlencode
 
 
 class FlightOffersPrice(Decorator, object):

setup.py

@@ -31,7 +31,6 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

specs/client/request_spec.py

@@ -2,10 +2,7 @@
 from expects import expect, equal, be_true, be_none, be_a
 from amadeus import Request
 
-try:
-    from urllib.request import Request as HTTPRequest
-except ImportError:  # pragma: no cover
-    from urllib2 import Request as HTTPRequest  # pragma: no cover
+from urllib.request import Request as HTTPRequest
 
 
 with description('Request') as self:

specs/mixins/http_spec.py

@@ -2,11 +2,7 @@
 from doublex import Spy, Stub, method_returning, method_raising
 from doublex_expects import have_been_called_with, have_been_called
 from expects import expect, equal, raise_error
-
-try:
-    from urllib.error import URLError
-except ImportError:  # pragma: no cover
-    from urllib2 import Request as URLError  # pragma: no cover
+from urllib.error import URLError
 
 from amadeus import Client, Response, ResponseError
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36
+envlist = py34,py35,py36
 
 [testenv]
 commands =
@@ -16,7 +16,6 @@ deps =
 usedevelop=True
 
 [tox:travis]
-2.7 = py27
 3.4 = py34
 3.5 = py35
 3.6 = py36