X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fnetns%2Fnetnsserver.py;h=0af5a27f8af7922333f441c45c57c628f219a6bf;hb=9199b66cf4e5c3bdf8926153a63084c352c40721;hp=224a60324462a284671f1788f2465c8946c4a3ee;hpb=6285ca51026efb69642eea9dfc7c480e722d84a9;p=nepi.git

diff --git a/src/nepi/resources/netns/netnsserver.py b/src/nepi/resources/netns/netnsserver.py
index 224a6032..0af5a27f 100644
--- a/src/nepi/resources/netns/netnsserver.py
+++ b/src/nepi/resources/netns/netnsserver.py
@@ -17,7 +17,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 import base64
-import cPickle
+import pickle
 import errno
 import logging
 import os
@@ -26,7 +26,7 @@ import sys
 
 from optparse import OptionParser, SUPPRESS_HELP
 
-from netnswrapper import NetNSWrapper
+from nepi.resources.netns.netnswrapper import NetNSWrapper
 
 class NetNSWrapperMessage:
     CREATE = "CREATE"
@@ -110,9 +110,9 @@ def recv_msg(conn):
 
     def decode(item):
         item = base64.b64decode(item).rstrip()
-        return cPickle.loads(item)
+        return pickle.loads(item)
 
-    decoded = map(decode, msg.split("|"))
+    decoded = [ decode(x) for x in msg.split("|")]
 
     # decoded message
     dmsg_type = decoded.pop(0)
@@ -122,7 +122,7 @@ def recv_msg(conn):
     return (dmsg_type, dargs, dkwargs)
 
 def send_reply(conn, reply):
-    encoded = base64.b64encode(cPickle.dumps(reply))
+    encoded = base64.b64encode(pickle.dumps(reply))
     conn.send("%s\n" % encoded)
 
 def get_options():