mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

First merge from the trunk straight into the py3k branch. I'm not

Browse source 
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.
This commit is contained in:
Guido van Rossum 2007-08-16 23:48:43 +00:00
parent 10c17ba299
commit af554a0e17
16 changed files with 206 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_warnings.py
View file

@ -61,7 +61,7 @@ class TestModule(unittest.TestCase):
def test_options(self):
# Uses the private _setoption() function to test the parsing
# of command-line warning arguments
with test_support.guard_warnings_filter():
with test_support.catch_warning():
self.assertRaises(warnings._OptionError,
warnings._setoption, '1:2:3:4:5:6')
self.assertRaises(warnings._OptionError,