Lots of little tweaks

Author: cbetta

.github/CONTRIBUTING.md

@@ -53,7 +53,7 @@ from amadeus import Client
 
 [TBD]
 
-## How to contribute to the Amadeus Ruby Gem
+## How to contribute to the Amadeus Python SDK
 
 #### **Did you find a bug?**
 

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2017 Amadeus IT Group SA
+Copyright (c) 2018 Amadeus IT Group SA
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

Makefile

@@ -19,7 +19,7 @@ run:
 			coverage html
 
 lint:
-			flake8 $(SOURCES) --exit-zero --max-complexity 5
+			flake8 $(SOURCES) --exit-zero
 
 docs:
 			rm -rf _docs

README.md

@@ -3,7 +3,7 @@
 [![Module Version](https://badge.fury.io/py/amadeus.svg)](https://badge.fury.io/py/amadeus)
 [![Build Status](http://img.shields.io/travis/amadeus4dev/amadeus-python.svg)][travis]
 [![Maintainability](https://api.codeclimate.com/v1/badges/c2e19cf9628d6f4aece2/maintainability)](https://codeclimate.com/github/amadeus4dev/amadeus-python/maintainability)
-[![Dependencies](.github/images/dependencies.svg)](gem)
+[![Dependencies](.github/images/dependencies.svg)](ttps://badge.fury.io/py/amadeus)
 [![Contact Support](.github/images/support.svg)][support]
 
 Amadeus provides a set of APIs for the travel industry. Flights, Hotels, Locations and more.
@@ -12,7 +12,7 @@ For more details see the [Python documentation](https://developer.amadeus.com/do
 
 ## Installation
 
-This gem requires Python 2.7+ or 3.3+. You can install install it directly with pip.
+This SDK requires Python 2.7+ or 3.3+. You can install install it directly with pip.
 
 ```sh
 pip install amadeus

amadeus/amadeus.py

@@ -5,20 +5,20 @@
 
 
 class Client(Namespaces, Pagination, Validator, HTTP, object):
-    """
+    '''
     The Amadeus client library for accessing
     the travel APIs.
-    """
+    '''
 
     # The available hosts for this API
     HOSTS = {
-      'test': 'test.api.amadeus.com',
-      'production': 'production.api.amadeus.com'
+        'test': 'test.api.amadeus.com',
+        'production': 'production.api.amadeus.com'
     }
 
     # The initialization method for the entire module
     def __init__(self, **options):
-        """
+        '''
         Initialize using your credentials:
 
         .. code-block:: python
@@ -74,7 +74,7 @@ def __init__(self, **options):
         :paramtype ssl: bool
 
         :raises ValueError: when a required param is missing
-        """
+        '''
         self._initialize_client_credentials(options)
         self._initialize_logger(options)
         self._initialize_host(options)

amadeus/client/access_token.py

@@ -15,7 +15,7 @@ def __init__(self, client):
 
     # The bearer token that can be used directly in API request headers
     def _bearer_token(self):
-        return "Bearer {0}".format(self.__token())
+        return 'Bearer {0}'.format(self.__token())
 
     # PRIVATE
 

amadeus/client/errors.py

@@ -2,7 +2,7 @@
 
 
 class ResponseError(RuntimeError):
-    """
+    '''
     An Amadeus error
 
     :var response: The response object containing the raw HTTP response and
@@ -16,7 +16,7 @@ class ResponseError(RuntimeError):
 
     :var description: The content of the response that describes the error
     :vartype description: str
-    """
+    '''
 
     def __init__(self, response):
         self.response = response
@@ -49,42 +49,42 @@ def __determine_code(self):
 
 
 class NetworkError(ResponseError):
-    """
+    '''
     This error occurs when there is some kind of error in the network
-    """
+    '''
     pass
 
 
 class ParserError(ResponseError):
-    """
+    '''
     This error occurs when the response type was JSOn but could not be parsed
-    """
+    '''
     pass
 
 
 class ServerError(ResponseError):
-    """
+    '''
     This error occurs when there is an error on the server
-    """
+    '''
     pass
 
 
 class ClientError(ResponseError):
-    """
+    '''
     This error occurs when the client did not provide the right parameters
-    """
+    '''
     pass
 
 
 class AuthenticationError(ResponseError):
-    """
+    '''
     This error occurs when the client did not provide the right credentials
-    """
+    '''
     pass
 
 
 class NotFoundError(ResponseError):
-    """
+    '''
     This error occurs when the path could not be found
-    """
+    '''
     pass

amadeus/client/location.py

@@ -1,6 +1,6 @@
 #
 class Location(object):
-    """
+    '''
     A list of location types, as used in searching for locations
 
     .. code-block:: python
@@ -16,7 +16,7 @@ class Location(object):
     :cvar AIRPORT: ``"AIRPORT"``
     :cvar CITY: ``"CITY"``
     :cvar ANY: ``"AIRPORT,CITY"``
-    """
+    '''
     # Airport
     AIRPORT = 'AIRPORT'
     # City

amadeus/client/request.py

@@ -1,4 +1,4 @@
-# Support Ruby 2 and 3 API calls without importing
+# Support Python 2 and 3 API calls without importing
 # a 3rd party library
 try:
     from urllib.request import Request as HTTPRequest
@@ -9,7 +9,7 @@
 
 
 class Request(object):
-    """
+    '''
     An object containing all the compiled information about the request made.
 
     :var host: The host used for this API call
@@ -51,7 +51,7 @@ class Request(object):
 
     :var app_version: The custom app version used for this request
     :vartype app_version: str
-    """
+    '''
 
     def __init__(self, options):
         self.http_request = None
@@ -86,10 +86,10 @@ def __initialize_headers(self):
 
     # Determines the User Agent
     def __build_user_agent(self):
-        user_agent = "amadeus-python/{0}".format(self.client_version)
-        user_agent += " python/{0}".format(self.language_version)
+        user_agent = 'amadeus-python/{0}'.format(self.client_version)
+        user_agent += ' python/{0}'.format(self.language_version)
         if self.app_id:
-            user_agent += " {0}/{1}".format(self.app_id, self.app_version)
+            user_agent += ' {0}/{1}'.format(self.app_id, self.app_version)
         return user_agent
 
     # Builds up a HTTP Request objectm if not akready set
@@ -116,9 +116,9 @@ def _encoded_params(self):
 
     # Builds up the full URL based on the scheme, host, path, and params
     def __full_url(self):
-        full_url = "{0}://{1}{2}".format(self.scheme, self.host, self.path)
+        full_url = '{0}://{1}{2}'.format(self.scheme, self.host, self.path)
         if (self.verb == 'GET'):
-            full_url += "?{0}".format(self._encoded_params())
+            full_url += '?{0}'.format(self._encoded_params())
         return full_url
 
     # Adds an extra header if the verb is POST

amadeus/client/response.py

@@ -2,7 +2,7 @@
 
 
 class Response(Parser, object):
-    """
+    '''
     The response object returned for every API call.
 
     :var http_response: the raw http response
@@ -25,7 +25,7 @@ class Response(Parser, object):
 
     :var status_code: The HTTP status code for the response, if any
     :vartype status_code: int
-    """
+    '''
 
     # Initialize the Response object with the
     # HTTPResponse object to parse, the client that made the request