Handle CensoredUsername#216: issues during re-pickling of data for th…

…e translations feature.

decompiler/magic.py

@@ -538,22 +538,22 @@ class SafePickler(pickle.Pickler if PY2 else pickle._Pickler):
     the classes themselves, and we need to override the method used for normally saving classes.
     """
 
-    def save_global(self, obj, name=None, pack=struct.pack):
+    def save_global(self, obj, name=None, pack=None):
         if isinstance(obj, FakeClassType):
             if PY2:
-                self.write(pickle.GLOBAL + obj.__module__ + '\n' + obj.__name__ + '\n')
+                self.write(pickle.GLOBAL
+                           + obj.__module__ + '\n' + obj.__name__ + '\n')
             elif self.proto >= 4:
                 self.save(obj.__module__)
                 self.save(obj.__name__)
-                self.write(STACK_GLOBAL)
+                self.write(pickle.STACK_GLOBAL)
             else:
-                self.write(pickle.GLOBAL +
-                    (obj.__module__ + '\n' + obj.__name__ + '\n').decode("utf-8")
-                )
+                self.write(pickle.GLOBAL
+                           + (obj.__module__ + '\n' + obj.__name__ + '\n').decode("utf-8"))
             self.memoize(obj)
             return
 
-        pickle.Pickler.save_global(self, obj, name, pack)
+        super().save_global(obj, name)
 
 # the main API
 

decompiler/renpycompat.py

@@ -42,6 +42,10 @@
 class oldset(set):
     __module__ = "__builtin__"
 
+    def __reduce__(self):
+        cls, args, state = super().__reduce__()
+        return (set, args, state)
+
 
 oldset.__name__ = "set"
 SPECIAL_CLASSES.append(oldset)
@@ -50,6 +54,10 @@ class oldset(set):
 class oldfrozenset(frozenset):
     __module__ = "__builtin__"
 
+    def __reduce__(self):
+        cls, args, state = super().__reduce__()
+        return (frozenset, args, state)
+
 
 oldfrozenset.__name__ = "frozenset"
 SPECIAL_CLASSES.append(oldfrozenset)