summaryrefslogtreecommitdiff
path: root/Lib/test/regrtest.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/regrtest.py')
-rwxr-xr-xLib/test/regrtest.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index fd6cafce7e..56c53dad3f 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -150,7 +150,6 @@ option '-uall,-bsddb'.
import cStringIO
import getopt
import itertools
-import json
import os
import random
import re
@@ -160,15 +159,13 @@ import traceback
import warnings
import unittest
-# I see no other way to suppress these warnings;
-# putting them in test_grammar.py has no effect:
-warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
- ".*test.test_grammar$")
-if sys.maxint > 0x7fffffff:
- # Also suppress them in <string>, because for 64-bit platforms,
- # that's where test_grammar.py hides them.
- warnings.filterwarnings("ignore", "hex/oct constants", FutureWarning,
- "<string>")
+with warnings.catch_warnings():
+ # Silence Py3k warnings
+ warnings.filterwarnings("ignore", "tuple parameter unpacking "
+ "has been removed", SyntaxWarning)
+ warnings.filterwarnings("ignore", "assignment to True or False "
+ "is forbidden", SyntaxWarning)
+ import json
# Ignore ImportWarnings that only occur in the source tree,
# (because of modules with the same name as source-directories in Modules/)