mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

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_struct.py
View file

@ -50,7 +50,7 @@ def any_err(func, *args):
def with_warning_restore(func):
def _with_warning_restore(*args, **kw):
with test.test_support.guard_warnings_filter():
with test.test_support.catch_warning():
# 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.