git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied the except and raise fixers to the master branch to close the gap with py3
[nepi.git]
/
src
/
nepi
/
util
/
sfarspec_proc.py
diff --git
a/src/nepi/util/sfarspec_proc.py
b/src/nepi/util/sfarspec_proc.py
index
e013e1a
..
f8c8bb2
100644
(file)
--- a/
src/nepi/util/sfarspec_proc.py
+++ b/
src/nepi/util/sfarspec_proc.py
@@
-66,19
+66,19
@@
class SfaRSpecProcessing(object):
try:
nodes = rspec.version.get_nodes()
try:
nodes = rspec.version.get_nodes()
- except Exception
,
e:
+ except Exception
as
e:
self._log.warn("Could not retrieve nodes in RSpec: %s" % e)
try:
leases = rspec.version.get_leases()
self._log.warn("Could not retrieve nodes in RSpec: %s" % e)
try:
leases = rspec.version.get_leases()
- except Exception
,
e:
+ except Exception
as
e:
self._log.warn("Could not retrieve leases in RSpec: %s" % e)
try:
links = rspec.version.get_links()
self._log.warn("Could not retrieve leases in RSpec: %s" % e)
try:
links = rspec.version.get_links()
- except Exception
,
e:
+ except Exception
as
e:
self._log.warn("Could not retrieve links in RSpec: %s" % e)
try:
channels = rspec.version.get_channels()
self._log.warn("Could not retrieve links in RSpec: %s" % e)
try:
channels = rspec.version.get_channels()
- except Exception
,
e:
+ except Exception
as
e:
self._log.warn("Could not retrieve channels in RSpec: %s" % e)
resources = []
self._log.warn("Could not retrieve channels in RSpec: %s" % e)
resources = []
@@
-197,7
+197,7
@@
class SfaRSpecProcessing(object):
elif resource_type == 'channel':
channels.append(resource)
else:
elif resource_type == 'channel':
channels.append(resource)
else:
- raise Exception
, "Not supported type of resource"
+ raise Exception
("Not supported type of resource")
rspec.version.add_nodes(nodes, rspec_content_type="request")
#rspec.version.add_leases(leases)
rspec.version.add_nodes(nodes, rspec_content_type="request")
#rspec.version.add_leases(leases)