git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe5b40a
)
some occurrences of items() that need being converted into list()
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Fri, 1 Apr 2016 08:31:13 +0000
(10:31 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Fri, 1 Apr 2016 10:02:14 +0000
(12:02 +0200)
sfa/rspecs/version.py
patch
|
blob
|
history
sfa/rspecs/versions/iotlabv1.py
patch
|
blob
|
history
sfa/rspecs/versions/ofeliav1.py
patch
|
blob
|
history
sfa/rspecs/versions/pgv2.py
patch
|
blob
|
history
sfa/rspecs/versions/pgv3.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/version.py
b/sfa/rspecs/version.py
index
0c74283
..
e67f493
100644
(file)
--- a/
sfa/rspecs/version.py
+++ b/
sfa/rspecs/version.py
@@
-8,7
+8,7
@@
class RSpecVersion:
schema = None
namespace = None
extensions = {}
schema = None
namespace = None
extensions = {}
- namespaces = dict(
extensions.items(
) + [('default', namespace)])
+ namespaces = dict(
list(extensions.items()
) + [('default', namespace)])
elements = []
enabled = False
elements = []
enabled = False
diff --git
a/sfa/rspecs/versions/iotlabv1.py
b/sfa/rspecs/versions/iotlabv1.py
index
856f778
..
0d39323
100644
(file)
--- 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",
}
'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
elements = []
# Network
diff --git
a/sfa/rspecs/versions/ofeliav1.py
b/sfa/rspecs/versions/ofeliav1.py
index
0608e7a
..
0a001cb
100755
(executable)
--- 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 = {}
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 = '<RSpec type="%s"></RSpec>' % type
template = '<rspec></rspec>'
#template = '<RSpec type="%s"></RSpec>' % type
template = '<rspec></rspec>'
diff --git
a/sfa/rspecs/versions/pgv2.py
b/sfa/rspecs/versions/pgv2.py
index
d63f944
..
b227d32
100644
(file)
--- 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",
}
'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):
# Networks
def get_networks(self):
diff --git
a/sfa/rspecs/versions/pgv3.py
b/sfa/rspecs/versions/pgv3.py
index
6d6a449
..
eb15b82
100644
(file)
--- 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",
}
'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 = []
elements = []