mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-41003: Fix test_copyreg when numpy is installed (GH-20935) (GH-20945)
Fix test_copyreg when numpy is installed: test.pickletester now
saves/restores warnings.filters when importing numpy, to ignore
filters installed by numpy.
Add the save_restore_warnings_filters() function to the
test.support.warnings_helper module.
(cherry picked from commit 8362893e3f
)
This commit is contained in:
parent
2c6d6c12c2
commit
b39d41ba1b
4 changed files with 29 additions and 13 deletions
|
@ -21,19 +21,25 @@ try:
|
|||
except ImportError:
|
||||
_testbuffer = None
|
||||
|
||||
try:
|
||||
import numpy as np
|
||||
except ImportError:
|
||||
np = None
|
||||
|
||||
from test import support
|
||||
from test.support import (
|
||||
TestFailed, TESTFN, run_with_locale, no_tracing,
|
||||
_2G, _4G, bigmemtest, reap_threads, forget,
|
||||
save_restore_warnings_filters
|
||||
)
|
||||
|
||||
from pickle import bytes_types
|
||||
|
||||
|
||||
# bpo-41003: Save/restore warnings filters to leave them unchanged.
|
||||
# Ignore filters installed by numpy.
|
||||
try:
|
||||
with save_restore_warnings_filters():
|
||||
import numpy as np
|
||||
except ImportError:
|
||||
np = None
|
||||
|
||||
|
||||
requires_32b = unittest.skipUnless(sys.maxsize < 2**32,
|
||||
"test is only meaningful on 32-bit builds")
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue