catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge conflicts.

Browse source
This commit is contained in:
Steve Pulec 2014-10-05 21:55:23 -04:00
commit 9de7969d2b
7 changed files with 530 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
moto/core/responses.py
View file

@ -64,9 +64,9 @@ class BaseResponse(object):
querystring[key] = [value, ]
if not querystring:
querystring.update(parse_qs(urlparse(full_url).query))
querystring.update(parse_qs(urlparse(full_url).query, keep_blank_values=True))
if not querystring:
querystring.update(parse_qs(self.body))
querystring.update(parse_qs(self.body, keep_blank_values=True))
if not querystring:
querystring.update(headers)