Skip to content

Fixed issue that query parameters double url encoded in python client #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2015
Merged

Fixed issue that query parameters double url encoded in python client #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/swagger-codegen/src/main/resources/python/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
"""
import sys
import os
import urllib

from models import *

Expand Down Expand Up @@ -78,6 +79,7 @@ class {{classname}}(object):
{{#pathParams}}
if ('{{paramName}}' in params):
replacement = str(self.apiClient.toPathValue(params['{{paramName}}']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + '{{baseName}}' + '}',
replacement)
{{/pathParams}}
Expand Down
4 changes: 2 additions & 2 deletions modules/swagger-codegen/src/main/resources/python/swagger.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ class ApiClient(object):
string -- quoted value
"""
if type(obj) == list:
return urllib.quote(','.join(obj))
return ','.join(obj)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When calling the method toPathValue on the query parameters, the query parameters will be urlencoded.
But in swagger.mustache 60 line,

if queryParams:
      # Need to remove None values, these should not be sent
      sentQueryParams = {}
      for param, value in queryParams.items():
        if value is not None:
          sentQueryParams[param] = ApiClient.sanitizeForSerialization(value)
      url = url + '?' + urllib.urlencode(sentQueryParams)

will urlencode query parameters again.
The query parameter will be double urlencoded.

else:
return urllib.quote(str(obj))
return str(obj)

@staticmethod
def sanitizeForSerialization(obj):
Expand Down