import files that are relative to the source as nepi.full.path

[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..c9e661d 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
-        from netnswrapper_debug import NetNSWrapperDebuger
+        from nepi.resources.netns.netnswrapper_debug import NetNSWrapperDebuger
         self._debuger = NetNSWrapperDebuger(enabled = enable_dump)
 
     @property
@@ -69,6 +69,7 @@ class NetNSWrapper(object):
         if clazzname == "open":
             path = args[0] 
             mode = args[1] 
+            # xxx Thierry: not sure where this gets closed
             obj = open(path, mode)
         else:
             clazz = getattr(netns, clazzname)
@@ -112,8 +113,9 @@ class NetNSWrapper(object):
         # If the result is an object (not a base value),
         # then keep track of the object a return the object
         # reference (newuuid)
+        # xxx the two instances of `int` are from 2to3
         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
 
@@ -183,7 +185,7 @@ class NetNSWrapper(object):
     def replace_kwargs(self, kwargs):
         realkwargs = dict([(k, self.get_object(v) \
                 if str(v).startswith("uuid") else v) \
-                for k,v in kwargs.iteritems()])
+                for k,v in kwargs.items()])
  
         return realkwargs