Merge remote-tracking branch 'origin/master' into 2.3.0

samples/client/petstore/python/petstore_api/api_client.py

@@ -97,6 +97,8 @@ class ApiClient(object):
                    _return_http_data_only=None, collection_formats=None, _preload_content=True,
                    _request_timeout=None):
 
+        config = Configuration()
+
         # header parameters
         header_params = header_params or {}
         header_params.update(self.default_headers)
@@ -113,8 +115,9 @@ class ApiClient(object):
             path_params = self.parameters_to_tuples(path_params,
                                                     collection_formats)
             for k, v in path_params:
+                # specified safe chars, encode everything
                 resource_path = resource_path.replace(
-                    '{%s}' % k, quote(str(v), safe=''))  # no safe chars, encode everything
+                    '{%s}' % k, quote(str(v), safe=config.safe_chars_for_path_param))
 
         # query parameters
         if query_params:

samples/client/petstore/python/petstore_api/configuration.py

@@ -78,6 +78,8 @@ class Configuration(object):
 
         # Proxy URL
         self.proxy = None
+        # Safe chars for path_param
+        self.safe_chars_for_path_param = ''
 
     @property
     def logger_file(self):