Merge remote-tracking branch 'origin/master' into edge

jonasbardino · jonasbardino · commit cbbf2bbb95b5 · 2024-10-01T12:33:53.000+02:00
diff --git a/tests/test_mig_shared_safeinput.py b/tests/test_mig_shared_safeinput.py
@@ -31,7 +31,7 @@
 import importlib
 import os
 import sys
-from past.builtins import basestring
+from past.builtins import basestring, unicode
 
 from tests.support import MigTestCase, testmain
 
