Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3 fixes

Browse Source
This commit is contained in:
jbencook 2015-12-17 17:43:16 +00:00
parent 3737b39e15
commit 3d6d3bfa27
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ecs/models.py
View File

@ -17,7 +17,7 @@ class BaseObject(object):
def gen_response_object(self): def gen_response_object(self):
response_object = self.__dict__.copy() response_object = self.__dict__.copy()
for key, value in response_object.iteritems(): for key, value in response_object.items():
if '_' in key: if '_' in key:
response_object[self.camelCase(key)] = value response_object[self.camelCase(key)] = value
del response_object[key] del response_object[key]
@ -169,7 +169,7 @@ class EC2ContainerServiceBackend(BaseBackend):
def list_services(self, cluster_str): def list_services(self, cluster_str):
cluster_name = cluster_str.split('/')[-1] cluster_name = cluster_str.split('/')[-1]
service_arns = [] service_arns = []
for key, value in self.services.iteritems(): for key, value in self.services.items():
if cluster_name + ':' in key: if cluster_name + ':' in key:
service_arns.append(self.services[key].arn) service_arns.append(self.services[key].arn)
return sorted(service_arns) return sorted(service_arns)

2
moto/ecs/responses.py
View File

@ -14,7 +14,7 @@ class EC2ContainerServiceResponse(BaseResponse):
@property @property
def request_params(self): def request_params(self):
try: try:
return json.loads(self.body) return json.loads(self.body.decode())
except ValueError: except ValueError:
return {} return {}