summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_random.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-16 23:48:43 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-16 23:48:43 (GMT)
commitaf554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch)
tree7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Lib/test/test_random.py
parent10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff)
downloadcpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.zip
cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.gz
cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.bz2
First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of stuff about the Doc tree, which I'm not merging this time due to the way the Doc tree was initially added. I am however adding roman.py which was added later to Doc/tools. I'll try to diff the two Doc trees separately to see if there's stuff I missed.
Diffstat (limited to 'Lib/test/test_random.py')
-rw-r--r--Lib/test/test_random.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index 43273d8..1989786 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -182,7 +182,7 @@ class WichmannHill_TestBasicOps(TestBasicOps):
def test_bigrand(self):
# Verify warnings are raised when randrange is too large for random()
- with test_support.guard_warnings_filter():
+ with test_support.catch_warning():
warnings.filterwarnings("error", "Underlying random")
self.assertRaises(UserWarning, self.gen.randrange, 2**60)