[Python-checkins] r46574 - python/trunk/Lib/test/test_struct.py

[neal.norwitz]

Author: neal.norwitz
Date: Wed May 31 11:02:44 2006
New Revision: 46574

Modified:
   python/trunk/Lib/test/test_struct.py
Log:
On 64-bit platforms running test_struct after test_tarfile would fail
since the deprecation warning wouldn't be raised.


Modified: python/trunk/Lib/test/test_struct.py
==============================================================================
--- python/trunk/Lib/test/test_struct.py	(original)
+++ python/trunk/Lib/test/test_struct.py	Wed May 31 11:02:44 2006
@@ -53,6 +53,12 @@
     # 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)