mirror of
https://github.com/python/cpython.git
synced 2025-11-03 15:11:34 +00:00
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.
This commit is contained in:
parent
10c17ba299
commit
af554a0e17
16 changed files with 206 additions and 33 deletions
|
|
@ -52,7 +52,7 @@ def compareData(self):
|
|||
def test_touched(self):
|
||||
# This really only tests that nothing unforeseen happens.
|
||||
import warnings
|
||||
with test_support.guard_warnings_filter():
|
||||
with test_support.catch_warning():
|
||||
warnings.filterwarnings('ignore', 'macostools.touched*',
|
||||
DeprecationWarning)
|
||||
macostools.touched(test_support.TESTFN)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue