still making both branches closer

[nepi.git] / src / nepi / resources / linux / ns3 / ns3client.py

diff --git a/src/nepi/resources/linux/ns3/ns3client.py b/src/nepi/resources/linux/ns3/ns3client.py
index 4d91938..ed41bdb 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3client.py
+++ b/src/nepi/resources/linux/ns3/ns3client.py
@@ -17,7 +17,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 import base64
-import cPickle
+import pickle
 import errno
 import os
 import socket
@@ -44,7 +44,7 @@ class LinuxNS3Client(NS3Client):
         msg = [msg_type, args, kwargs]
 
         def encode(item):
-            item = cPickle.dumps(item)
+            item = pickle.dumps(item)
             return base64.b64encode(item)
 
         encoded = "|".join(map(encode, msg))
@@ -79,7 +79,7 @@ class LinuxNS3Client(NS3Client):
                     self.simulation.error(msg, reply, err)
                     raise RuntimeError(msg)
                        
-        reply = cPickle.loads(base64.b64decode(reply))
+        reply = pickle.loads(base64.b64decode(reply))
 
         return reply