Merge branch 'hotel_v2' of https://github.com/anthonyroux/amadeus-python into hotel_v2

Author: Anthony Roux

.github/CONTRIBUTING.md

@@ -6,13 +6,23 @@ git clone https://github.com/amadeus4dev/amadeus-python.git
 cd amadeus-python
 ```
 
-First, ensure you have a version of every Python we support installed. Your versions may differ.
+First, make sure your pyenv is initialized for each environment (`pyenv init `).
+If you want to have it loaded automatically, add the following to ~/.zshrc:
+
+```sh
+eval "$(pyenv init -)"
+```
+
+Second, ensure you have a version of every Python we support installed. Your versions may differ.
 
 ```sh
 pyenv install 2.7.14
 pyenv install 3.3.7
-pyenv install ...
-pyenv global 3.6.3 3.5.4 3.4.7 3.3.7 2.7.14   
+pyenv install 3.4.9
+pyenv install 3.5.6
+pyenv install 3.6.3
+pyenv install 3.6.8
+pyenv global 3.6.8 3.6.3 3.5.6 3.4.9 3.3.7 2.7.14   
 ```
 
 Next ensure you create a virtual environment.

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.0.1 - 2019-01-17
+-------------------- 
+
+Fix pagination URL encoding parameters
+
 2.0.0 - 2018-10-14
 -------------------- 
 

README.rst

@@ -220,8 +220,8 @@ List of supported endpoints
     # Get a specific city or airport based on its id
     amadeus.reference_data.location('ALHR').get()
 
-    # Airport Nearest Relevant Airport
-    amadeus.reference_data.locations.airports.get(longitude=49.000, latitude=2.55)
+    # Airport Nearest Relevant Airport (for London)
+    amadeus.reference_data.locations.airports.get(longitude=0.1278, latitude=51.5074)
 
     # Flight Most Searched Destinations
     # Which were the most searched flight destinations from Madrid in August 2017?

amadeus/client/request.py

@@ -112,7 +112,7 @@ def __request_for_verb(self):
 
     # Encodes the params before sending them
     def _encoded_params(self):
-        return urlencode(self.params)
+        return self._urlencode(self.params)
 
     # Builds up the full URL based on the scheme, host, path, and params
     def __full_url(self):
@@ -141,3 +141,20 @@ def __add_bearer_token_header(self):
     # Applies all the headers to the HTTP Request object
     def __apply_headers(self, http_request):
         http_request.headers = self.headers
+
+    # Helper method to prepare the parameter encoding
+    def _urlencode(self, d):
+        return urlencode(self._flatten_keys(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:
+            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:
+                self._flatten_keys(d[k], str(key) + str(keystr), out)
+            else:
+                out['{}{}'.format(key, keystr)] = d[k]
+        return out

amadeus/version.py

@@ -1,2 +1,2 @@
-version_info = (2, 0, 0)
+version_info = (2, 0, 1)
 version = '.'.join(str(v) for v in version_info)