diff --git a/moto/ecs/models.py b/moto/ecs/models.py index 812a3fa29..820c99fd1 100644 --- a/moto/ecs/models.py +++ b/moto/ecs/models.py @@ -17,7 +17,7 @@ class BaseObject(object): def gen_response_object(self): response_object = self.__dict__.copy() - for key, value in response_object.iteritems(): + for key, value in response_object.items(): if '_' in key: response_object[self.camelCase(key)] = value del response_object[key] @@ -169,7 +169,7 @@ class EC2ContainerServiceBackend(BaseBackend): def list_services(self, cluster_str): cluster_name = cluster_str.split('/')[-1] service_arns = [] - for key, value in self.services.iteritems(): + for key, value in self.services.items(): if cluster_name + ':' in key: service_arns.append(self.services[key].arn) return sorted(service_arns) diff --git a/moto/ecs/responses.py b/moto/ecs/responses.py index 6608a9cfb..de2fdb48b 100644 --- a/moto/ecs/responses.py +++ b/moto/ecs/responses.py @@ -14,7 +14,7 @@ class EC2ContainerServiceResponse(BaseResponse): @property def request_params(self): try: - return json.loads(self.body) + return json.loads(self.body.decode()) except ValueError: return {}