X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fnetns%2Fnetnswrapper.py;h=9dff830ebbdfc4167a01853647ae262580cff92f;hb=9199b66cf4e5c3bdf8926153a63084c352c40721;hp=74bd69a79b00d4e9c0a7e1147b1b0a5d99cd6270;hpb=a92223f91edd2eeb48e1ad70aa4c843d778bfe94;p=nepi.git

diff --git a/src/nepi/resources/netns/netnswrapper.py b/src/nepi/resources/netns/netnswrapper.py
index 74bd69a7..9dff830e 100644
--- a/src/nepi/resources/netns/netnswrapper.py
+++ b/src/nepi/resources/netns/netnswrapper.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,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
@@ -70,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)
@@ -184,7 +184,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