Compatibilty issues regarding py2 solved

Eldinnie · Eldinnie · commit 0fd9a4ed516d · 2018-02-22T12:02:32.000+01:00
For Py2 compatibility
diff --git a/telegram/ext/picklepersistence.py b/telegram/ext/picklepersistence.py
@@ -74,21 +74,25 @@ def load_singlefile(self):
                 self.user_data = defaultdict(dict, all['user_data'])
                 self.chat_data = defaultdict(dict, all['chat_data'])
                 self.conversations = all['conversations']
-        except FileNotFoundError:
+        except IOError:
             self.conversations = {}
             self.user_data = defaultdict(dict)
             self.chat_data = defaultdict(dict)
         except pickle.UnpicklingError:
             raise TypeError("File {} does not contain valid pickle data".format(filename))
+        except Exception:
+            raise TypeError("Something went wrong unpickling {}".format(filename))
 
     def load_file(self, filename):
         try:
             with open(filename, "rb") as f:
                 return pickle.load(f)
-        except FileNotFoundError:
+        except IOError:
             return None
         except pickle.UnpicklingError:
             raise TypeError("File {} does not contain valid pickle data".format(filename))
+        except Exception:
+            raise TypeError("Something went wrong unpickling {}".format(filename))
 
     def dump_singlefile(self):
         with open(self.filename, "wb") as f:
diff --git a/tests/test_basepersistence.py b/tests/test_basepersistence.py
@@ -66,7 +66,7 @@ def test_creation(self, base_persistence):
         with pytest.raises(NotImplementedError):
             base_persistence.update_user_data(None)
         with pytest.raises(NotImplementedError):
-            base_persistence.update_conversations(None)
+            base_persistence.update_conversations(None, None)
         with pytest.raises(NotImplementedError):
             base_persistence.flush()
 
diff --git a/tests/test_pickle_persistence.py b/tests/test_pickle_persistence.py
@@ -41,8 +41,8 @@ def pickle_persistence():
 def bad_pickle_files():
     for name in ['pickletest_user_data', 'pickletest_chat_data', 'pickletest_conversations',
                  'pickletest']:
-        with open(name, 'wb') as f:
-            f.write(bytes('nonesense', 'utf8'))
+        with open(name, 'w') as f:
+            f.write('(())')
     yield True
     for name in ['pickletest_user_data', 'pickletest_chat_data', 'pickletest_conversations',
                  'pickletest']:
