]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Python 3: fix invalid operation on dict_items objects
authorCyril Roelandt <cyril@redhat.com>
Thu, 1 Oct 2015 11:31:48 +0000 (13:31 +0200)
committerCyril Roelandt <cyril@redhat.com>
Thu, 1 Oct 2015 13:32:26 +0000 (15:32 +0200)
One cannot use "+" on "dict_items" objects in Python 3.

Partial-Bug: #1500400
Change-Id: Ide04b3eaa70b6f453cbc11442109f8c88b084305

neutron/extensions/qos.py

index 6653416b78bff45ea306a7a0e05791eb03004f6f..382e15f975be0f1d10e9fd88da86b06d30c4b4ea 100644 (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 {}