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
/
resources
/
planetlab
/
plcapi.py
diff --git
a/src/nepi/resources/planetlab/plcapi.py
b/src/nepi/resources/planetlab/plcapi.py
index
683a4d4
..
d2970e8
100644
(file)
--- a/
src/nepi/resources/planetlab/plcapi.py
+++ b/
src/nepi/resources/planetlab/plcapi.py
@@
-212,7
+212,7
@@
class PLCAPI(object):
try:
# test authorization
network_types = _retry(self.mcapi.GetNetworkTypes)(self.auth)
try:
# test authorization
network_types = _retry(self.mcapi.GetNetworkTypes)(self.auth)
- except (xmlrpclib.ProtocolError, xmlrpclib.Fault)
,
e:
+ except (xmlrpclib.ProtocolError, xmlrpclib.Fault)
as
e:
warnings.warn(str(e))
return True
warnings.warn(str(e))
return True
@@
-284,7
+284,7
@@
class PLCAPI(object):
* plain : boolean, use plain bootstrapfs image if set (for tests)
"""
if not isinstance(node, (str, int, long)):
* plain : boolean, use plain bootstrapfs image if set (for tests)
"""
if not isinstance(node, (str, int, long)):
- raise ValueError
, "Node must be either a non-unicode string or an int"
+ raise ValueError
("Node must be either a non-unicode string or an int")
return _retry(self.mcapi.GetNodeFlavour)(self.auth, node)
def get_nodes(self, node_id_or_name = None, fields = None, **kw):
return _retry(self.mcapi.GetNodeFlavour)(self.auth, node)
def get_nodes(self, node_id_or_name = None, fields = None, **kw):