openstack
/
heat
Code Issues Proposed changes

Merge "Fix code compatibility with Python 3"

This commit is contained in:
Jenkins 2015-11-02 05:08:38 +00:00 committed by Gerrit Code Review
parent 6e240bfe4e eb067db724
commit a089c6724a
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/objects/resource.py
View File

@ -70,12 +70,9 @@ class Resource(
return None
for field in resource.fields:
if field == 'data':
resource['data'] = map(
lambda resd: resource_data.ResourceData._from_db_object(
resource_data.ResourceData(context), resd
),
db_resource.data
)
resource['data'] = [resource_data.ResourceData._from_db_object(
resource_data.ResourceData(context), resd
) for resd in db_resource.data]
else:
resource[field] = db_resource[field]

6
heat/objects/service.py
View File

@ -46,10 +46,8 @@ class Service(base.VersionedObject,
@classmethod
def _from_db_objects(cls, context, list_obj):
return map(lambda obj: cls._from_db_object(context,
cls(context),
obj),
list_obj)
return [cls._from_db_object(context, cls(context), obj)
for obj in list_obj]
@classmethod
def get_by_id(cls, context, service_id):

16
heat/objects/stack.py
View File

@ -114,23 +114,15 @@ class Stack(
@classmethod
def get_all(cls, context, *args, **kwargs):
db_stacks = db_api.stack_get_all(context, *args, **kwargs)
stacks = map(
lambda db_stack: cls._from_db_object(
context,
cls(context),
db_stack),
db_stacks)
stacks = [cls._from_db_object(context, cls(context), db_stack)
for db_stack in db_stacks]
return stacks
@classmethod
def get_all_by_owner_id(cls, context, owner_id):
db_stacks = db_api.stack_get_all_by_owner_id(context, owner_id)
stacks = map(
lambda db_stack: cls._from_db_object(
context,
cls(context),
db_stack),
db_stacks)
stacks = [cls._from_db_object(context, cls(context), db_stack)
for db_stack in db_stacks]
return stacks
@classmethod