From dcc8694f016cc476a64447b99483a5f9994c2e29 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 1 Apr 2016 10:31:13 +0200 Subject: [PATCH] some occurrences of items() that need being converted into list() --- sfa/rspecs/version.py | 2 +- sfa/rspecs/versions/iotlabv1.py | 2 +- sfa/rspecs/versions/ofeliav1.py | 2 +- sfa/rspecs/versions/pgv2.py | 2 +- sfa/rspecs/versions/pgv3.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sfa/rspecs/version.py b/sfa/rspecs/version.py index 0c742836..e67f493d 100644 --- a/sfa/rspecs/version.py +++ b/sfa/rspecs/version.py @@ -8,7 +8,7 @@ class RSpecVersion: schema = None namespace = None extensions = {} - namespaces = dict(extensions.items() + [('default', namespace)]) + namespaces = dict(list(extensions.items()) + [('default', namespace)]) elements = [] enabled = False diff --git a/sfa/rspecs/versions/iotlabv1.py b/sfa/rspecs/versions/iotlabv1.py index 856f7787..0d393237 100644 --- a/sfa/rspecs/versions/iotlabv1.py +++ b/sfa/rspecs/versions/iotlabv1.py @@ -32,7 +32,7 @@ class Iotlabv1(RSpecVersion): 'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1", 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", } - namespaces = dict(extensions.items() + [('default', namespace)]) + namespaces = dict(list(extensions.items()) + [('default', namespace)]) elements = [] # Network diff --git a/sfa/rspecs/versions/ofeliav1.py b/sfa/rspecs/versions/ofeliav1.py index 0608e7a0..0a001cbd 100755 --- a/sfa/rspecs/versions/ofeliav1.py +++ b/sfa/rspecs/versions/ofeliav1.py @@ -24,7 +24,7 @@ class Ofelia(RSpecVersion): schema = 'https://github.com/fp7-ofelia/ocf/blob/ocf.rspecs/openflow/schemas/ad.xsd' namespace = 'openflow' extensions = {} - namespaces = dict(extensions.items() + [('default', namespace)]) + namespaces = dict(list(extensions.items()) + [('default', namespace)]) #template = '' % type template = '' diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index d63f9442..b227d321 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -20,7 +20,7 @@ class PGv2(RSpecVersion): 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", 'plos': "http://www.planet-lab.org/resources/sfa/ext/plos/1", } - namespaces = dict(extensions.items() + [('default', namespace)]) + namespaces = dict(list(extensions.items()) + [('default', namespace)]) # Networks def get_networks(self): diff --git a/sfa/rspecs/versions/pgv3.py b/sfa/rspecs/versions/pgv3.py index 6d6a4494..eb15b82f 100644 --- a/sfa/rspecs/versions/pgv3.py +++ b/sfa/rspecs/versions/pgv3.py @@ -11,7 +11,7 @@ class GENIv3(PGv2): 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", 'plos': "http://www.planet-lab.org/resources/sfa/ext/plos/1", } - namespaces = dict(extensions.items() + [('default', namespace)]) + namespaces = dict(list(extensions.items()) + [('default', namespace)]) elements = [] -- 2.43.0