Skip to content

Commit

Permalink
Fix py3 redshift encoding.
Browse files Browse the repository at this point in the history
  • Loading branch information
spulec committed Mar 16, 2017
1 parent 6666351 commit e9e49c5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Latest
* The normal @mock_<service> decorators will no longer work with boto. It is suggested that you upgrade to boto3 or use the standalone-server mode. If you would still like to use boto, you must use the @mock_<service>_deprecated decorators which will be removed in a future release.
* The @mock_s3bucket_path decorator is now deprecated. Use the @mock_s3 decorator instead.
* Drop support for Python 2.6
* Redshift server defaults to returning XML instead of JSON

Added
* Reset API: a reset API has been added to flush all of the current data ex: `requests.post("http://motoapi.amazonaws.com/moto-api/reset")`
Expand Down
2 changes: 1 addition & 1 deletion moto/redshift/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def get_response(self, response):
return json.dumps(response)
else:
xml = dicttoxml.dicttoxml(response, attr_type=False, root=False)
return xml
return xml.decode("utf-8")

def create_cluster(self):
cluster_kwargs = {
Expand Down

0 comments on commit e9e49c5

Please sign in to comment.