Blocked revisions 63485-63491 via svnmerge

........
  r63485 | georg.brandl | 2008-05-20 08:49:28 +0200 (Tue, 20 May 2008) | 2 lines

  Tkinter renaming reversal: Delete all stubs from lib-tk.
........
  r63486 | georg.brandl | 2008-05-20 08:58:21 +0200 (Tue, 20 May 2008) | 2 lines

  Tkinter renaming reversal: move modules back in their place.
........
  r63487 | georg.brandl | 2008-05-20 09:13:37 +0200 (Tue, 20 May 2008) | 2 lines

  Tkinter rename reversal: remove tkinter package, adapt imports and docs.
........
  r63488 | georg.brandl | 2008-05-20 09:20:12 +0200 (Tue, 20 May 2008) | 2 lines

  Add notes that tkinter modules will be renamed.
........
  r63489 | georg.brandl | 2008-05-20 09:21:58 +0200 (Tue, 20 May 2008) | 2 lines

  Standardize renaming notes.
........
  r63490 | georg.brandl | 2008-05-20 09:23:25 +0200 (Tue, 20 May 2008) | 2 lines

  Remove rest of the tkinter package.
........
  r63491 | georg.brandl | 2008-05-20 09:23:59 +0200 (Tue, 20 May 2008) | 2 lines

  Remove debugging line.
........

........
  r63481 | fred.drake | 2008-05-20 02:08:38 -0400 (Tue, 20 May 2008) | 3 lines

  revert creation of the html.entities and html.parser modules
  (http://bugs.python.org/issue2882)
........

........
  r63460 | ronald.oussoren | 2008-05-18 15:54:47 -0500 (Sun, 18 May 2008) | 6 lines

  - Add unittests for platform.mac_ver (or rather, ensure that the unittest for
    that function actually tests something on OSX).

  - Add documentation to platform.mac_ver that explains why the middle element
    of the return value will not contain useful information.
........
  r63464 | benjamin.peterson | 2008-05-18 17:07:42 -0500 (Sun, 18 May 2008) | 2 lines

  fix test_platform (os was not imported)
........

I'm blocking this until #2854 can be applied

issues in the weakset implementation discovered with it.

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63438 | georg.brandl | 2008-05-17 23:54:03 +0200 (Sat, 17 May 2008) | 3 lines

  Rename html.parser file, and split html.entities from htmllib
  to ease removal of the latter in Py3k.
........

........
  r63440 | georg.brandl | 2008-05-18 00:11:54 +0200 (Sun, 18 May 2008) | 2 lines

  #2353: raise Py3k warning in file.xreadlines().
........

includes merge of trunk revision 63432

........
  r63434 | fred.drake | 2008-05-17 17:23:02 -0400 (Sat, 17 May 2008) | 3 lines

  document the renames for modules moved to the html package
  (http://bugs.python.org/issue2882)
........

........
  r63430 | fred.drake | 2008-05-17 16:30:04 -0400 (Sat, 17 May 2008) | 3 lines

  rename HTMLParser to html.parser, htmlentitydefs to html.entities
  (http://bugs.python.org/issue2882)
........

........
  r63428 | benjamin.peterson | 2008-05-17 15:09:42 -0500 (Sat, 17 May 2008) | 2 lines

  revert 63425 over Guido's Febuary message about this, that I missed
........

........
  r63425 | benjamin.peterson | 2008-05-17 14:21:20 -0500 (Sat, 17 May 2008) | 2 lines

  add Py3k warnings to oct and hex. backport hex behavior (because it's not different)
........
  r63426 | benjamin.peterson | 2008-05-17 14:51:10 -0500 (Sat, 17 May 2008) | 2 lines

  fix spelling
........

Blocked revisions 63374,63376,63381-63382,63408-63410,63413-63414 via svnmerge

........
  r63374 | georg.brandl | 2008-05-16 16:24:45 +0200 (Fri, 16 May 2008) | 2 lines

  Step 1 of Tkinter renaming: move lib-tk modules into a new "tkinter" package.
........
  r63376 | georg.brandl | 2008-05-16 17:48:15 +0200 (Fri, 16 May 2008) | 2 lines

  Tkinter rename, step 2: fix imports and add stub modules.
........
  r63381 | georg.brandl | 2008-05-16 19:37:53 +0200 (Fri, 16 May 2008) | 2 lines

  Doc changes for the big Tkinter rename.
........
  r63382 | georg.brandl | 2008-05-16 19:40:23 +0200 (Fri, 16 May 2008) | 2 lines

  NEWS entry for Tkinter rename.
........
  r63408 | georg.brandl | 2008-05-17 17:07:03 +0200 (Sat, 17 May 2008) | 2 lines

  Tkinter rename: merge tkSimpleDialog and tkFileDialog into simpledialog and filedialog.
........
  r63409 | georg.brandl | 2008-05-17 17:21:58 +0200 (Sat, 17 May 2008) | 2 lines

  Tkinter: make stub modules.
........
  r63410 | georg.brandl | 2008-05-17 17:30:35 +0200 (Sat, 17 May 2008) | 2 lines

  Move imports to file top.
........
  r63413 | georg.brandl | 2008-05-17 20:14:43 +0200 (Sat, 17 May 2008) | 2 lines

  Rewrap consistently to 70 chars, and standardize the way of referring to issues.
........
  r63414 | georg.brandl | 2008-05-17 20:15:24 +0200 (Sat, 17 May 2008) | 2 lines

  Really move the imports to the top this time. :)
........

........
  r63392 | alexandre.vassalotti | 2008-05-16 15:14:31 -0400 (Fri, 16 May 2008) | 2 lines

  Added Python 3.0 warning to cPickle.
........

This was bug introduced by merge r63352.

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines

  Rename the test file of reprlib.
........
  r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines

  Make generator repr consistent with function and code object repr.
........
  r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines

  #2869: remove parameter from signature.
........
  r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line

  Fixed #2870: cmathmodule.c compile error
........
  r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line

  Following Amaury's advice
........
  r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines

  #2890: support os.O_ASYNC and fcntl.FASYNC.
........
  r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines

  #2845: fix copy2's docs.
........
  r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines

  Don't allow keyword arguments to reversed().
........
  r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines

  Document O_ASYNC addition.
........
  r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines

  Fix reprlib docs.
........

I was sure I had done so in r63360.  That is weird...

Rename enumerate() kw argument name to "iterable" and fix "sequence"->"iterable" in some docstrings.

Merged revisions 63357 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63357 | alexandre.vassalotti | 2008-05-16 02:58:49 -0400 (Fri, 16 May 2008) | 2 lines

  Changed references to the reprlib module to use its new name.
........

........
  r63358 | alexandre.vassalotti | 2008-05-16 03:00:58 -0400 (Fri, 16 May 2008) | 2 lines

  Updated reprlib's documentation to mention the renaming.
........

........
  r63354 | alexandre.vassalotti | 2008-05-16 02:37:57 -0400 (Fri, 16 May 2008) | 3 lines

  Renamed the repr module to reprlib.
  Added stub module for repr.
........

Merged revisions 63208-63209,63211-63212,63214-63217,63219-63224,63226-63227,63229-63232,63234-63235,63237-63239,63241,63243-63246,63250-63254,63256-63259,63261,63263-63264,63266-63267,63269-63270,63272-63273,63275-63276,63278,63280-63281,63283-63284,63286-63287,63289-63290,63292-63293,63295-63296,63298-63299,63301-63302,63304-63305,63307,63309-63314,63316-63322,63324-63325,63327-63335,63337-63338,63340-63342,63344-63346,63348 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63208 | georg.brandl | 2008-05-13 15:04:54 -0400 (Tue, 13 May 2008) | 2 lines

  #2831: add start argument to enumerate(). Patch by Scott Dial and me.
........
  r63209 | marc-andre.lemburg | 2008-05-13 15:10:45 -0400 (Tue, 13 May 2008) | 3 lines

  Remove leftovers from reverted setuptools checkin (they were added in r45525).
........
  r63211 | georg.brandl | 2008-05-13 17:32:03 -0400 (Tue, 13 May 2008) | 2 lines

  Fix a refleak in the _warnings module.
........
  r63212 | andrew.kuchling | 2008-05-13 20:46:41 -0400 (Tue, 13 May 2008) | 1 line

  List all the removes and renamed modules
........
  r63214 | brett.cannon | 2008-05-13 21:09:40 -0400 (Tue, 13 May 2008) | 2 lines

  Rewrap some lines in test_py3kwarn.
........
  r63219 | georg.brandl | 2008-05-14 02:34:15 -0400 (Wed, 14 May 2008) | 2 lines

  Add NEWS entry for #2831.
........
  r63220 | neal.norwitz | 2008-05-14 02:47:56 -0400 (Wed, 14 May 2008) | 3 lines

  Fix "refleak" by restoring the tearDown method removed by accident (AFAICT)
  in r62788.
........
  r63221 | georg.brandl | 2008-05-14 03:18:22 -0400 (Wed, 14 May 2008) | 2 lines

  Fix another "refleak" by clearing the filters after test.
........
  r63222 | neal.norwitz | 2008-05-14 03:21:42 -0400 (Wed, 14 May 2008) | 5 lines

  Install the json package and tests as well as the lib2to3 tests
  so the tests work when run from an install directory.
  They are currently skipped on the daily runs (not from the buildbots)
  for checking refleaks, etc.
........
  r63256 | andrew.kuchling | 2008-05-14 21:10:24 -0400 (Wed, 14 May 2008) | 1 line

  Note some removals and a rename
........
  r63311 | brett.cannon | 2008-05-15 00:36:53 -0400 (Thu, 15 May 2008) | 2 lines

  Add a snippet for the deprecation directive for docs.
........
  r63313 | gregory.p.smith | 2008-05-15 00:56:18 -0400 (Thu, 15 May 2008) | 5 lines

  disable the crashing test.  I will also file a bug.  This crash does
  not appear to be a new bug, its just that the test coverage went up
  recently exposing it.  (I verified that by testing this test code on
  an older Modules/_bsddb.c)
........
  r63320 | georg.brandl | 2008-05-15 11:08:32 -0400 (Thu, 15 May 2008) | 2 lines

  #2863: add gen.__name__ and add this name to generator repr().
........
  r63324 | andrew.kuchling | 2008-05-15 16:07:39 -0400 (Thu, 15 May 2008) | 1 line

  Import class from distutils.cmd, not .core, to avoid circular import
........
  r63327 | alexandre.vassalotti | 2008-05-15 16:31:42 -0400 (Thu, 15 May 2008) | 2 lines

  Fixed typo in a doctest of test_genexps.
........
  r63332 | benjamin.peterson | 2008-05-15 18:34:33 -0400 (Thu, 15 May 2008) | 2 lines

  add Mac modules to the list of deprecated ones
........
  r63333 | benjamin.peterson | 2008-05-15 18:41:16 -0400 (Thu, 15 May 2008) | 2 lines

  fix typos in whatsnew
........
  r63348 | benjamin.peterson | 2008-05-15 22:24:49 -0400 (Thu, 15 May 2008) | 2 lines

  make test_platform a bit more assertive (We'll see what the buildbots say.)
........

........
  r63105 | alexandre.vassalotti | 2008-05-11 19:12:38 -0400 (Sun, 11 May 2008) | 2 lines

  Revert commit r63086.
........
  r63240 | alexandre.vassalotti | 2008-05-14 17:52:37 -0400 (Wed, 14 May 2008) | 5 lines

  Moved copy_reg stub module to lib-old/.

  Stub modules will be easier to track (and remove) if they are all kept
  in lib-old/, instead of sprinkling them throughout the library.
........
  r63255 | alexandre.vassalotti | 2008-05-14 20:33:57 -0400 (Wed, 14 May 2008) | 6 lines

  Revert distutils changes done in r63248.

  As explained by Marc-Andre Lemburg, distutils needs to stay
  backward-compatible. Therefore, it should use the old ConfigParser
  module name.
........
  r63279 | brett.cannon | 2008-05-14 23:32:11 -0400 (Wed, 14 May 2008) | 1 line

  Deprecate imgfile for removal in 3.0.
........
  r63323 | andrew.kuchling | 2008-05-15 16:06:51 -0400 (Thu, 15 May 2008) | 1 line

  Use lowercase version of module name
........
  r63326 | alexandre.vassalotti | 2008-05-15 16:30:56 -0400 (Thu, 15 May 2008) | 5 lines

  Revert r63323: Use lowercase version of module name.

  The distutils module should continue to use the old ConfigParser name,
  for backward-compatibility.
........
  r63347 | alexandre.vassalotti | 2008-05-15 22:06:59 -0400 (Thu, 15 May 2008) | 6 lines

  Fixed import of configparser in the distutils module.

  If configparser is unavailable, try to import configparser using its
  old name. This is required for backward-compatibility with older
  Python versions.
........

Merged revisions 63119-63128,63130-63131,63133,63135-63144,63146-63148,63151-63152,63155-63165,63167-63176,63181-63186,63188-63189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63119 | benjamin.peterson | 2008-05-11 20:41:23 -0400 (Sun, 11 May 2008) | 2 lines

  #2196 hasattr now allows SystemExit and KeyboardInterrupt to propagate
........
  r63122 | benjamin.peterson | 2008-05-11 20:46:49 -0400 (Sun, 11 May 2008) | 2 lines

  make message slightly more informative, so there's no chance of misunderstanding it
........
  r63158 | ronald.oussoren | 2008-05-12 07:24:33 -0400 (Mon, 12 May 2008) | 5 lines

  Remove references to platform 'mac'

  The 'mac' platform (that is, os.name == 'mac') was used for the MacOS 9 port,
  which is no longer supported (as of Python 2.4 IIRC).
........
  r63159 | ronald.oussoren | 2008-05-12 07:31:05 -0400 (Mon, 12 May 2008) | 8 lines

  MacOSX: remove dependency on Carbon package for urllib

  This patch removes the dependency on the Carbon package from urllib.
  The mac-specific code for getting proxy configuration is now writting in
  Python using ctypes and uses the SystemConfiguration framework instead of
  InternetConfig. Also provides a mac-specific implementation of proxy_bypass.
........
  r63162 | eric.smith | 2008-05-12 10:00:01 -0400 (Mon, 12 May 2008) | 1 line

  Added 'n' presentation type for integers.
........
  r63164 | georg.brandl | 2008-05-12 12:26:52 -0400 (Mon, 12 May 2008) | 2 lines

  #1713041: fix pprint's handling of maximum depth.
........
  r63170 | georg.brandl | 2008-05-12 12:53:42 -0400 (Mon, 12 May 2008) | 2 lines

  Fix parameter name for enumerate().
........
  r63173 | georg.brandl | 2008-05-12 13:01:58 -0400 (Mon, 12 May 2008) | 2 lines

  #2766: remove code without effect.
........
  r63174 | georg.brandl | 2008-05-12 13:04:10 -0400 (Mon, 12 May 2008) | 3 lines

  #2767: don't clear globs in run() call, since they could be needed in tearDown,
  which clears them at the end.
........
  r63175 | georg.brandl | 2008-05-12 13:14:51 -0400 (Mon, 12 May 2008) | 2 lines

  #1760: try-except-finally is one statement since PEP 341.
........
  r63186 | amaury.forgeotdarc | 2008-05-12 17:30:24 -0400 (Mon, 12 May 2008) | 2 lines

  Sync code with documentation, and remove Win95 support in winsound module.
........
  r63189 | amaury.forgeotdarc | 2008-05-12 18:21:39 -0400 (Mon, 12 May 2008) | 3 lines

  Adapt test_pyclbr to the new version of urllib.py:
  The new mac-specific functions must be ignored.
........

........
  r63145 | brett.cannon | 2008-05-11 23:19:20 -0400 (Sun, 11 May 2008) | 1 line

  Deprecate the multifile module as per PEP 4.
........
  r63149 | brett.cannon | 2008-05-11 23:45:59 -0400 (Sun, 11 May 2008) | 2 lines

  Deprecate the sv module as per PEP 4.
........
  r63150 | brett.cannon | 2008-05-11 23:47:47 -0400 (Sun, 11 May 2008) | 1 line

  Deprecate the timing module for removal in Python 3.0.
........

........
  r63343 | brett.cannon | 2008-05-15 17:50:02 -0700 (Thu, 15 May 2008) | 1 line

  Deprecated statvfs for removal in 3.0.
........

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63339 | brett.cannon | 2008-05-15 17:37:42 -0700 (Thu, 15 May 2008) | 2 lines

  Remove the last usage of statvfs in the stdlib.
........