Changeset 2284

Timestamp:

09/28/11 19:19:15 (8 months ago)

Author:

dart

Message:

Replace pickle by cpickle (lot faster)

Location:

trunk

Files:

• common/datalink_data.py (modified) (1 diff)
• common/szobjects/szimage.py (modified) (2 diffs)
• common/szobjects/szobject.py (modified) (3 diffs)
• loplug/plugins/datalink/pgdatalink.py (modified) (2 diffs)
• lotatc_server/datalink_server.py (modified) (2 diffs)

trunk/common/datalink_data.py

@@ -20 +20 @@
 import math
 import logging
-import pickle
+import cPickle
 import uuid
 import shutil

trunk/common/szobjects/szimage.py

@@ -76 +76 @@
         try:
             fd = open( fileName, 'wb')
-            fb.write( pickle.dumps( self))
+            fb.write( cPickle.dumps( self))
             fd.close()
         except:
@@ -90 +90 @@
             buffer = fd.read()
             fd.close()
-            return pickle.loads( buffer)
+            return cPickle.loads( buffer)
         except:
             return None

trunk/common/szobjects/szobject.py

@@ -17 +17 @@
 # 
 
-import pickle
+import cPickle
 
 ### NOTES:
@@ -52 +52 @@
     # @return String
     def to_string( self):
-        return pickle.dumps( self)
+        return cPickle.dumps( self)
 #----------------------------------------------------------------
     ## Get lines of text
@@ -77 +77 @@
     @staticmethod
     def from_string( str):
-        return pickle.loads( str)
+        return cPickle.loads( str)

trunk/loplug/plugins/datalink/pgdatalink.py

@@ -15 +15 @@
 
 import os
-import pickle
+import cPickle
 import uuid
 
@@ -118 +118 @@
         
         # Get sent capabilities
-        self.capabilities = pickle.loads( datas)
+        self.capabilities = cPickle.loads( datas)
         
         # Save capabilities with its version

trunk/lotatc_server/datalink_server.py

@@ -20 +20 @@
 import math
 import logging
-import pickle
+import cPickle
 
 from szobjects                import *
@@ -178 +178 @@
   # @param self  instance id
   def __sendCapabilitiesToPlug__( self):
-    txFrame = "%s|%s|" % ( self.OPCODE_CAPABILITIES, self.CAPABILITIES_VERSION) + pickle.dumps( self.capabilities)
+    txFrame = "%s|%s|" % ( self.OPCODE_CAPABILITIES, self.CAPABILITIES_VERSION) + cPickle.dumps( self.capabilities)
     self.cnxObj.sendFrame( txFrame)