summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-05-31 09:02:44 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-05-31 09:02:44 (GMT)
commit9f16dd026c8284fbd4796289d611f59bd9b53797 (patch)
tree0b0b0a460c39e377ffa1cf7f4eab5fb3bf5ee30c /Lib
parent377f54e85fbf1cc953c690b260e81e630a2be253 (diff)
downloadcpython-9f16dd026c8284fbd4796289d611f59bd9b53797.zip
cpython-9f16dd026c8284fbd4796289d611f59bd9b53797.tar.gz
cpython-9f16dd026c8284fbd4796289d611f59bd9b53797.tar.bz2
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_struct.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index da7f40c..a6c0b49 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -53,6 +53,12 @@ def deprecated_err(func, *args):
# The `warnings` module doesn't have an advertised way to restore
# its filter list. Cheat.
save_warnings_filters = warnings.filters[:]
+ # Grrr, we need this function to warn every time. Without removing
+ # the warningregistry, running test_tarfile then test_struct would fail
+ # on 64-bit platforms.
+ globals = func.func_globals
+ if '__warningregistry__' in globals:
+ del globals['__warningregistry__']
warnings.filterwarnings("error", r"""^struct.*""", DeprecationWarning)
warnings.filterwarnings("error", r""".*format requires.*""",
DeprecationWarning)