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
a first very rough step towards python3
[nepi.git]
/
src
/
nepi
/
resources
/
netns
/
netnswrapper.py
diff --git
a/src/nepi/resources/netns/netnswrapper.py
b/src/nepi/resources/netns/netnswrapper.py
index
6c0968b
..
24da1a9
100644
(file)
--- a/
src/nepi/resources/netns/netnswrapper.py
+++ b/
src/nepi/resources/netns/netnswrapper.py
@@
-33,7
+33,7
@@
class NetNSWrapper(object):
self._logger.setLevel(loglevel)
# Object to dump instructions to reproduce and debug experiment
self._logger.setLevel(loglevel)
# Object to dump instructions to reproduce and debug experiment
- from netnswrapper_debug import NetNSWrapperDebuger
+ from
.
netnswrapper_debug import NetNSWrapperDebuger
self._debuger = NetNSWrapperDebuger(enabled = enable_dump)
@property
self._debuger = NetNSWrapperDebuger(enabled = enable_dump)
@property
@@
-113,7
+113,7
@@
class NetNSWrapper(object):
# then keep track of the object a return the object
# reference (newuuid)
if not (result is None or type(result) in [
# then keep track of the object a return the object
# reference (newuuid)
if not (result is None or type(result) in [
- bool, float,
long
, str, int]):
+ bool, float,
int
, str, int]):
self._objects[newuuid] = result
result = newuuid
self._objects[newuuid] = result
result = newuuid
@@
-183,7
+183,7
@@
class NetNSWrapper(object):
def replace_kwargs(self, kwargs):
realkwargs = dict([(k, self.get_object(v) \
if str(v).startswith("uuid") else v) \
def replace_kwargs(self, kwargs):
realkwargs = dict([(k, self.get_object(v) \
if str(v).startswith("uuid") else v) \
- for k,v in kwargs.ite
rite
ms()])
+ for k,v in kwargs.items()])
return realkwargs
return realkwargs