From 88f64deff9df1870d543803c6254aa43914b6ed2 Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Sat, 5 Mar 2016 18:01:57 -0500 Subject: [PATCH] fix py3 --- moto/apigateway/models.py | 2 +- moto/apigateway/responses.py | 2 +- tests/test_apigateway/test_apigateway.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/moto/apigateway/models.py b/moto/apigateway/models.py index 5dfffecca..68017d5d1 100644 --- a/moto/apigateway/models.py +++ b/moto/apigateway/models.py @@ -210,7 +210,7 @@ class RestAPI(object): return self.deployments[deployment_id] def get_deployments(self): - return self.deployments.values() + return list(self.deployments.values()) def delete_deployment(self, deployment_id): return self.deployments.pop(deployment_id) diff --git a/moto/apigateway/responses.py b/moto/apigateway/responses.py index 03776c9f4..c954d69df 100644 --- a/moto/apigateway/responses.py +++ b/moto/apigateway/responses.py @@ -9,7 +9,7 @@ from .models import apigateway_backends class APIGatewayResponse(BaseResponse): def _get_param(self, key): - return json.loads(self.body).get(key) + return json.loads(self.body.decode("ascii")).get(key) @property def backend(self): diff --git a/tests/test_apigateway/test_apigateway.py b/tests/test_apigateway/test_apigateway.py index b9b4ce9a9..03fa797a2 100644 --- a/tests/test_apigateway/test_apigateway.py +++ b/tests/test_apigateway/test_apigateway.py @@ -515,4 +515,4 @@ def test_http_proxying_integration(): deploy_url = "https://{api_id}.execute-api.{region_name}.amazonaws.com/{stage_name}".format(api_id=api_id, region_name=region_name, stage_name=stage_name) - requests.get(deploy_url).content.should.equal("a fake response") + requests.get(deploy_url).content.should.equal(b"a fake response")