From d92ac89c675f9e5213890e293eac857c6e9af316 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Thu, 1 Oct 2015 13:31:48 +0200 Subject: [PATCH] Python 3: fix invalid operation on dict_items objects One cannot use "+" on "dict_items" objects in Python 3. Partial-Bug: #1500400 Change-Id: Ide04b3eaa70b6f453cbc11442109f8c88b084305 --- neutron/extensions/qos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/extensions/qos.py b/neutron/extensions/qos.py index 6653416b7..382e15f97 100644 --- a/neutron/extensions/qos.py +++ b/neutron/extensions/qos.py @@ -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 {} -- 2.45.2