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:
Guido van Rossum 2007-08-16 23:48:43 +00:00
parent 10c17ba299
commit af554a0e17
16 changed files with 206 additions and 33 deletions

View file

@ -1,7 +1,7 @@
import unittest
import __builtin__
import warnings
from test.test_support import run_unittest, guard_warnings_filter
from test.test_support import run_unittest
import os
from platform import system as platform_system