Harmonize pickletester.py imports with RustPython

fanninpm · fanninpm · commit 981fac0881cd · 2022-02-05T13:48:52.000-05:00
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
@@ -22,11 +22,14 @@
     _testbuffer = None
 
 from test import support
+from test.support import os_helper
 from test.support import (
-    TestFailed, TESTFN, run_with_locale, no_tracing,
-    _2G, _4G, bigmemtest, reap_threads, forget,
-    save_restore_warnings_filters
+    TestFailed, run_with_locale, no_tracing,
+    _2G, _4G, bigmemtest, reap_threads
     )
+from test.support.import_helper import forget
+from test.support.os_helper import TESTFN
+from test.support.warnings_helper import save_restore_warnings_filters
 
 from pickle import bytes_types
 
@@ -3302,15 +3305,15 @@ def test_dump_closed_file(self):
             f.close()
             self.assertRaises(ValueError, self.dump, 123, f)
         finally:
-            support.unlink(TESTFN)
+            os_helper.unlink(TESTFN)
 
     def test_load_closed_file(self):
         f = open(TESTFN, "wb")
         try:
             f.close()
             self.assertRaises(ValueError, self.dump, 123, f)
         finally:
-            support.unlink(TESTFN)
+            os_helper.unlink(TESTFN)
 
     def test_load_from_and_dump_to_file(self):
         stream = io.BytesIO()
@@ -3341,7 +3344,7 @@ def test_dump_text_file(self):
                 self.assertRaises(TypeError, self.dump, 123, f, proto)
         finally:
             f.close()
-            support.unlink(TESTFN)
+            os_helper.unlink(TESTFN)
 
     def test_incomplete_input(self):
         s = io.BytesIO(b"X''.")
diff --git a/Lib/test/test_pickletools.py b/Lib/test/test_pickletools.py
@@ -91,7 +91,7 @@ def test__all__(self):
                      'markobject', 'stackslice', 'OpcodeInfo', 'opcodes',
                      'code2op',
                      }
-        support.check__all__(self, pickletools, blacklist=blacklist)
+        support.check__all__(self, pickletools, not_exported=blacklist)
 
 
 def load_tests(loader, tests, pattern):

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def test__all__(self):`
`91`	`91`	`'markobject', 'stackslice', 'OpcodeInfo', 'opcodes',`
`92`	`92`	`'code2op',`
`93`	`93`	`}`
`94`		`- support.check__all__(self, pickletools, blacklist=blacklist)`
	`94`	`+ support.check__all__(self, pickletools, not_exported=blacklist)`
`95`	`95`
`96`	`96`
`97`	`97`	`def load_tests(loader, tests, pattern):`