]> granicus.if.org Git - python/commit
Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
authorÉric Araujo <merwok@netwok.org>
Thu, 3 Feb 2011 00:12:18 +0000 (00:12 +0000)
committerÉric Araujo <merwok@netwok.org>
Thu, 3 Feb 2011 00:12:18 +0000 (00:12 +0000)
commit54274ad96aa033b9f3744dce395d08047467cca9
tree169a1e37a391723c17c3ed8a0c29df97ab9c378d
parent67843b3886192a1ee31cc12edba2ad41b758c97d
Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

To comply with the 2.x doc style, the methods in trace.rst use brackets around
optional arguments.  The rest is a mostly straight merge, modulo support changed
to test_support and use of the old super call style in test_tuple.

........
  r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines

  Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
  r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines

  Prevent ResourceWarnings in test_gettext
........
  r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines

  Add missing NEWS entry for a fix committed by Senthil.

  All recent modifications to distutils should now be covered in NEWS.
........
  r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines

  This was actually fixed for the previous alpha.
........
  r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines

  Improve trace documentation (#9264).  Patch by Eli Bendersky.
........
  r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines

  Use nested method directives, rewrap long lines, fix whitespace.
........
  r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines

  Fix typo in superclass method name
........
37 files changed:
Doc/library/trace.rst
Lib/distutils/tests/__init__.py
Lib/distutils/tests/test_archive_util.py
Lib/distutils/tests/test_bdist_msi.py
Lib/distutils/tests/test_build.py
Lib/distutils/tests/test_build_clib.py
Lib/distutils/tests/test_build_py.py
Lib/distutils/tests/test_build_scripts.py
Lib/distutils/tests/test_check.py
Lib/distutils/tests/test_clean.py
Lib/distutils/tests/test_cmd.py
Lib/distutils/tests/test_config.py
Lib/distutils/tests/test_config_cmd.py
Lib/distutils/tests/test_core.py
Lib/distutils/tests/test_dep_util.py
Lib/distutils/tests/test_dir_util.py
Lib/distutils/tests/test_dist.py
Lib/distutils/tests/test_file_util.py
Lib/distutils/tests/test_filelist.py
Lib/distutils/tests/test_install.py
Lib/distutils/tests/test_install_data.py
Lib/distutils/tests/test_install_headers.py
Lib/distutils/tests/test_install_lib.py
Lib/distutils/tests/test_install_scripts.py
Lib/distutils/tests/test_msvc9compiler.py
Lib/distutils/tests/test_register.py
Lib/distutils/tests/test_sdist.py
Lib/distutils/tests/test_spawn.py
Lib/distutils/tests/test_text_file.py
Lib/distutils/tests/test_unixccompiler.py
Lib/distutils/tests/test_upload.py
Lib/distutils/tests/test_util.py
Lib/distutils/tests/test_version.py
Lib/distutils/tests/test_versionpredicate.py
Lib/test/test_gettext.py
Lib/test/test_tuple.py
Misc/NEWS