From: Neal Norwitz <nnorwitz@gmail.com>
Date: Wed, 31 May 2006 09:02:44 +0000 (+0000)
Subject: On 64-bit platforms running test_struct after test_tarfile would fail
X-Git-Tag: v2.5b1~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f16dd026c8284fbd4796289d611f59bd9b53797;p=python

On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.
---

diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index da7f40c6bb..a6c0b4949f 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)