Merge branch 'master' into update-old-libraries

Author: tsolakoua

amadeus/booking/_flight_orders.py

@@ -14,12 +14,12 @@ def post(self, flight, travelers):
         :raises amadeus.ResponseError: if the request could not be completed
         '''
         flight_offers = []
-        if type(flight) is not list:
+        if not isinstance(flight, list):
             flight_offers.append(flight)
         else:
             flight_offers.extend(flight)
         travelers_info = []
-        if type(travelers) is not list:
+        if not isinstance(travelers, list):
             travelers_info.append(travelers)
         else:
             travelers_info.extend(travelers)

amadeus/booking/_hotel_bookings.py

@@ -19,11 +19,11 @@ def post(self, hotel_offer_id, guests, payments):
         '''
         guests_info = []
         payment_info = []
-        if type(guests) is not list:
+        if not isinstance(guests, list):
             guests_info.append(guests)
         else:
             guests_info.extend(guests)
-        if type(payments) is not list:
+        if not isinstance(payments, list):
             payment_info.append(payments)
         else:
             payment_info.extend(payments)

amadeus/client/errors.py

@@ -38,7 +38,8 @@ def description(self):
 
     # Determines the short description, printed after on the same line as the
     # error class name
-    def short_description(self, response):
+    @staticmethod
+    def short_description(response):
         if hasattr(response, 'status_code') and response.status_code:
             return '[{0}]'.format(response.status_code)
         else:
@@ -56,7 +57,8 @@ def long_description(self, response):
         return message
 
     # Returns the description of a single error
-    def error_description(self, response):
+    @staticmethod
+    def error_description(response):
         message = ''
         if 'error' in response.result:
             message += '\n{0}'.format(response.result['error'])
@@ -69,7 +71,8 @@ def errors_descriptions(self, response):
         return ''.join(messages)
 
     # Returns the description of a single error in a multi error response
-    def errors_description(self, error):
+    @staticmethod
+    def errors_description(error):
         message = '\n'
         if ('source' in error) and ('parameter' in error['source']):
             message += '[{0}] '.format(error['source']['parameter'])

amadeus/client/request.py

@@ -109,7 +109,7 @@ def __build_http_request(self):
             # Adds HTTP override in Header for the list of paths required
             if self.path in Request.list_httpoverride:
                 self.headers['X-HTTP-Method-Override'] = 'GET'
-            if type(self.params) is dict:
+            if isinstance(self.params, dict):
                 return HTTPRequest(self.url, headers=self.headers, method='POST',
                                    data=json.dumps(self.params).encode())
             else:
@@ -142,12 +142,12 @@ def _urlencode(self, d):
 
     # Flattens the hash keys, so page: { offset: 1 } becomes page[offet] = 1
     def _flatten_keys(self, d, key, out):
-        if type(d) is not dict:
+        if not isinstance(d, dict):
             raise TypeError('Only dicts can be encoded')
 
         for k in d:
             keystr = k if not key else '[{}]'.format(k)
-            if type(d[k]) is dict:
+            if isinstance(d[k], dict):
                 self._flatten_keys(d[k], str(key) + str(keystr), out)
             else:
                 out['{}{}'.format(key, keystr)] = d[k]

amadeus/mixins/http.py

@@ -39,7 +39,7 @@ def get(self, path, **params):
         '''
         return self.request('GET', path, params)
 
-    def post(self, path, params={}):
+    def post(self, path, params=None):
         '''
         A helper function for making generic POST requests calls. It is used by
         every namespaced API POST method.

amadeus/mixins/pagination.py

@@ -33,7 +33,8 @@ def __page(self, name, response):
             params
         )
 
-    def __page_number_for(self, name, response):
+    @staticmethod
+    def __page_number_for(name, response):
         try:
             url = response.result['meta']['links'][name]
             return url.split('page%5Boffset%5D=')[1].split('&')[0]

amadeus/mixins/parser.py

@@ -15,7 +15,8 @@ def _detect_error(self, client):
         if error is not None:
             self.__raise_error(error, client)
 
-    def error_for(self, status_code, parsed):  # noqa: C901
+    @staticmethod  # noqa: C901
+    def error_for(status_code, parsed):
         if status_code is None:
             return NetworkError
         if status_code >= 500:

amadeus/mixins/validator.py

@@ -14,7 +14,8 @@ class Validator(object):
     # Checks a list of options for unrecognized keys and warns the user.
     # This is mainly used to provide a nice experience when users make a typo
     # in their arguments.
-    def _warn_on_unrecognized_options(self, options, logger, valid_options):
+    @staticmethod
+    def _warn_on_unrecognized_options(options, logger, valid_options):
         for key in options:
             if (key in valid_options):
                 continue
@@ -68,7 +69,8 @@ def __init_required(self, key, options):
     # Tries to find an option by string or symbol in the options hash and
     # in the environment variables.When it can not find it anywhere it
     # defaults to the provided default option.
-    def __init_optional(self, key, options, defa_ult=None):
+    @staticmethod
+    def __init_optional(key, options, defa_ult=None):
         value = options.get(key, None)
         if (value is None):
             env_key = 'AMADEUS_{0}'.format(key.upper())

amadeus/namespaces/_travel.py

@@ -12,8 +12,10 @@ def __init__(self, client):
         self.predictions = Predictions(client)
         self.trip_parser = TripParser(client)
 
-    def from_file(self, file):
+    @staticmethod
+    def from_file(file):
         return from_file(file)
 
-    def from_base64(self, base64):
+    @staticmethod
+    def from_base64(base64):
         return from_base64(base64)

amadeus/shopping/flight_offers/_pricing.py

@@ -17,7 +17,7 @@ def post(self, body, **params):
         '''
         url = '/v1/shopping/flight-offers/pricing?'
         flight_offers = []
-        if type(body) is not list:
+        if not isinstance(body, list):
             flight_offers.append(body)
         else:
             flight_offers.extend(body)