diff --git a/modules/swagger-codegen/src/main/resources/python/requirements.mustache b/modules/swagger-codegen/src/main/resources/python/requirements.mustache
index f00e08fa339..bafdc07532f 100644
--- a/modules/swagger-codegen/src/main/resources/python/requirements.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/requirements.mustache
@@ -1,5 +1,5 @@
 certifi >= 14.05.14
-six == 1.8.0
+six >= 1.10
 python_dateutil >= 2.5.3
 setuptools >= 21.0.0
 urllib3 >= 1.15.1
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
index f161cfb9f99..620bb3e4bc8 100644
--- a/samples/client/petstore/python/petstore_api/api_client.py
+++ b/samples/client/petstore/python/petstore_api/api_client.py
@@ -116,7 +116,7 @@ def __call_api(self, resource_path, method,
                                                     collection_formats)
             for k, v in path_params:
                 resource_path = resource_path.replace(
-                    '{%s}' % k, quote(str(v), safe=""))
+                    '{%s}' % k, quote(str(v), safe=''))  # no safe chars, encode everything
 
         # query parameters
         if query_params: