Save language restoration (#154)

* fix: resolve bug with python version in language loading via dill * ci: add newline
PaccMann · Apr 16, 2022 · 00ff5b4 · 00ff5b4
1 parent c1e624b
commit 00ff5b4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/pytoda/__init__.py b/pytoda/__init__.py
@@ -1,2 +1,2 @@
 name = 'pytoda'
-__version__ = '1.0.1'
+__version__ = '1.0.2'
diff --git a/pytoda/proteins/protein_language.py b/pytoda/proteins/protein_language.py
@@ -107,8 +107,17 @@ def load(filepath: str) -> 'ProteinLanguage':
         Returns:
             ProteinLanguage: the loaded Protein language object.
         """
-        with open(filepath, 'rb') as f:
-            protein_language = dill.load(f)
+        try:
+            with open(filepath, 'rb') as f:
+                protein_language = dill.load(f)
+        except TypeError:
+            # Necessary to load python3.7 pickled objects with >=3.8
+            # For details see: https://github.com/uqfoundation/dill/pull/406
+            storage = dill._dill._reverse_typemap['CodeType']
+            dill._dill._reverse_typemap['CodeType'] = dill._dill._create_code
+            with open(filepath, 'rb') as f:
+                protein_language = dill.load(f)
+            dill._dill._reverse_typemap['CodeType'] = storage
         return protein_language
 
     @staticmethod

diff --git a/pytoda/smiles/smiles_language.py b/pytoda/smiles/smiles_language.py
@@ -176,8 +176,17 @@ def load(filepath: str) -> 'SMILESLanguage':
         warnings.warn(
             "Loading languages will use a text files in the future", FutureWarning
         )
-        with open(filepath, 'rb') as f:
-            smiles_language = dill.load(f)
+        try:
+            with open(filepath, 'rb') as f:
+                smiles_language = dill.load(f)
+        except TypeError:
+            # Necessary to load python3.7 pickled objects with >=3.8:
+            # For details see: https://github.com/uqfoundation/dill/pull/406
+            storage = dill._dill._reverse_typemap['CodeType']
+            dill._dill._reverse_typemap['CodeType'] = dill._dill._create_code
+            with open(filepath, 'rb') as f:
+                smiles_language = dill.load(f)
+            dill._dill._reverse_typemap['CodeType'] = storage
         return smiles_language
 
     @staticmethod