Changeset 955:d98b211d32fa for src

Timestamp:

05/12/19 07:18:47 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Fixed pickling of PIREPs saved with Python 2 (re #347).

Location:

src/mlx

Files:

• common.py (modified) (1 diff)
• pirep.py (modified) (3 diffs)
• rpc.py (modified) (2 diffs)

src/mlx/common.py

@@ -31 +31 @@
 
     from gi.repository import GObject as gobject
+
+#-------------------------------------------------------------------------------
+
+def fixUnpickledValue(value):
+    """Fix the given unpickled value.
+
+    It handles some basic data, like scalars, lists and tuples. If it
+    encounters byte arrays, they are decoded as 'utf-8' strings."""
+    if isinstance(value, bytes):
+        return str(value, "utf-8")
+    elif isinstance(value, list):
+        return [fixUnpickledValue(v) for v in value]
+    elif isinstance(value, tuple):
+        return tuple([fixUnpickledValue(v) for v in value])
+    else:
+        return value
+
+#-------------------------------------------------------------------------------
+
+def fixUnpickled(state):
+    """Fix the given unpickled state.
+
+    It checks keys and values, and if it encounters any byte arrays, they are
+    decoded with the encoding 'utf-8'. It returns a new dictionary.
+    """
+    newDict = {}
+    for (key, value) in iter(state.items()):
+        newDict[fixUnpickledValue(key)] = fixUnpickledValue(value)
+
+    return newDict

src/mlx/pirep.py

@@ -2 +2 @@
 from .util import utf2unicode
 from .flight import Flight
+from .common import fixUnpickled
 
 from . import const
@@ -114 +115 @@
         try:
             with open(path, "rb") as f:
-                pirep = pickle.load(f)
+                pirep = pickle.load(f, fix_imports = True, encoding = "bytes")
                 if "numCrew" not in dir(pirep):
                     pirep.numCrew = pirep.bookedFlight.numCrew
@@ -412 +413 @@
 
         return ([], attrs)
+
+    def __setstate__(self, state):
+        """Set the state from the given unpickled dictionary."""
+        self.__dict__.update(fixUnpickled(state))

src/mlx/rpc.py

@@ -2 +2 @@
 from . import rpccommon
 
-from .common import MAVA_BASE_URL
+from .common import MAVA_BASE_URL, fixUnpickled
 
 import jsonrpclib
@@ -322 +322 @@
         print("foglalas_id=%s" % ("0" if self.id is None else self.id,), file=f)
 
+    def __setstate__(self, state):
+        """Set the state from the given unpickled dictionary."""
+        self.__dict__.update(fixUnpickled(state))
+
 #---------------------------------------------------------------------------------------