openstack
/
neutron
Code Issues Proposed changes

Merge "Python 3: fix invalid operation on dict_items objects"

This commit is contained in:
Jenkins 2015-10-02 18:19:41 +00:00 committed by Gerrit Code Review
parent 89e41148b3 d92ac89c67
commit 1194a70bd0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/extensions/qos.py
View File

@ -164,8 +164,8 @@ class Qos(extensions.ExtensionDescriptor):
def get_extended_resources(self, version):
if version == "2.0":
return dict(EXTENDED_ATTRIBUTES_2_0.items() +
RESOURCE_ATTRIBUTE_MAP.items())
return dict(list(EXTENDED_ATTRIBUTES_2_0.items()) +
list(RESOURCE_ATTRIBUTE_MAP.items()))
else:
return {}