README moves to markdown

[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 1dd0c5a..ed41bdb 100644 (file)
--- a/src/nepi/resources/linux/ns3/ns3client.py
+++ b/src/nepi/resources/linux/ns3/ns3client.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 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
@@ -18,7 +17,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 import base64
-import cPickle
+import pickle
 import errno
 import os
 import socket
@@ -45,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))
@@ -80,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