openstack/neutron
Code Issues Proposed changes

Python 3: fix invalid operation on dict_items objects

Browse Source 
One cannot use "+" on "dict_items" objects in Python 3.

Partial-Bug: #1500400
Change-Id: Ide04b3eaa70b6f453cbc11442109f8c88b084305
This commit is contained in:
Cyril Roelandt 2015-10-01 13:31:48 +02:00
parent 9ccefdac56
commit d92ac89c67
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 {}