Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r63412 | georg.brandl | 2008-05-17 19:57:01 +0200 (Sat, 17 May 2008) | 2 lines

  #961805: fix Edit.text_modified().
........
  r63445 | georg.brandl | 2008-05-18 10:52:59 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #180 by Michael Schneider: add examples to the socketserver documentation.
........
  r63446 | georg.brandl | 2008-05-18 11:12:20 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #134, #171, #137: unit tests for the three HTTPServer modules.
........
  r63447 | georg.brandl | 2008-05-18 12:39:26 +0200 (Sun, 18 May 2008) | 3 lines

  Take namedtuple item names only from ascii_letters (this blew up on OSX),
  and make sure there are no duplicate names.
........
  r63449 | georg.brandl | 2008-05-18 13:46:51 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #217: add support for compiling Python with coverage checking enabled.
........
  r63450 | georg.brandl | 2008-05-18 13:52:36 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #257: test distutils' build_ext command, written by Josip Dzolonga.
........
  r63452 | georg.brandl | 2008-05-18 15:34:06 +0200 (Sun, 18 May 2008) | 2 lines

  Add GHOP students.
........
  r63454 | georg.brandl | 2008-05-18 18:32:48 +0200 (Sun, 18 May 2008) | 2 lines

  GHOP #121: improve test_pydoc, by Benjamin Peterson.
........
  r63459 | benjamin.peterson | 2008-05-18 22:48:07 +0200 (Sun, 18 May 2008) | 2 lines

  bring test_pydoc up to my high standards (now that I have them)
........
  r63463 | georg.brandl | 2008-05-18 23:10:19 +0200 (Sun, 18 May 2008) | 2 lines

  Fix test_pyclbr after another platform-dependent function was added to urllib.
........
  r63465 | benjamin.peterson | 2008-05-19 01:07:07 +0200 (Mon, 19 May 2008) | 2 lines

  change some imports in tests so they will not be skipped in 3.0
........
  r63470 | georg.brandl | 2008-05-19 18:47:25 +0200 (Mon, 19 May 2008) | 2 lines

  test_httpservers has unpredictable refcount behavior.
........
  r63483 | georg.brandl | 2008-05-20 08:15:36 +0200 (Tue, 20 May 2008) | 2 lines

  Activate two more test cases in test_httpservers.
........
  r63484 | georg.brandl | 2008-05-20 08:47:31 +0200 (Tue, 20 May 2008) | 2 lines

  Argh, this is the *actual* test that works under Windows.
........
  r63496 | georg.brandl | 2008-05-20 10:07:36 +0200 (Tue, 20 May 2008) | 2 lines

  Improve diffing logic and output for test_pydoc.
........
  r63497 | georg.brandl | 2008-05-20 10:10:03 +0200 (Tue, 20 May 2008) | 2 lines

  Use inspect.getabsfile() to get the documented module's filename.
........
  r63499 | georg.brandl | 2008-05-20 10:25:48 +0200 (Tue, 20 May 2008) | 3 lines

  Patch #1775025: allow opening zipfile members via ZipInfo instances.
  Patch by Graham Horler.
........
  r63500 | georg.brandl | 2008-05-20 10:40:43 +0200 (Tue, 20 May 2008) | 2 lines

  #2592: delegate nb_index and the floor/truediv slots in weakref.proxy.
........
  r63501 | georg.brandl | 2008-05-20 10:48:34 +0200 (Tue, 20 May 2008) | 2 lines

  #615772: raise a more explicit error from Tkinter.Misc.__contains__.
........
  r63530 | benjamin.peterson | 2008-05-22 02:57:02 +0200 (Thu, 22 May 2008) | 2 lines

  use more specific asserts in test_opcode
........
  r63531 | benjamin.peterson | 2008-05-22 03:02:23 +0200 (Thu, 22 May 2008) | 2 lines

  remove redundant invocation of json doctests
........
  r63540 | benjamin.peterson | 2008-05-23 01:09:26 +0200 (Fri, 23 May 2008) | 3 lines

  fix test_pydoc so it works on make installed Python installations
  Also let it pass when invoked directly
........
  r63614 | georg.brandl | 2008-05-25 10:07:37 +0200 (Sun, 25 May 2008) | 2 lines

  #2959: allow multiple close() calls for GzipFile.
........

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

................
  r63644 | martin.v.loewis | 2008-05-25 19:19:22 +0200 (So, 25 Mai 2008) | 10 lines

  Merged revisions 63634-63643 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r63643 | martin.v.loewis | 2008-05-25 19:18:21 +0200 (So, 25 Mai 2008) | 3 lines

    Don't abort on IOErrors caused by saving pickle files.
    Fixes #2938.
  ........
................

........
  r63586 | georg.brandl | 2008-05-24 20:08:33 +0200 (Sat, 24 May 2008) | 2 lines

  socketserver renaming reversal part 1: remove stub module.
........
  r63587 | georg.brandl | 2008-05-24 20:11:29 +0200 (Sat, 24 May 2008) | 5 lines

  socketserver renaming reversal part 2: move rename module.

  I'm doing this case-only rename in a two-step process via a different directory
  to hopefully avoid problems with case-insensitive filesystems.
........
  r63588 | guilherme.polo | 2008-05-24 20:24:49 +0200 (Sat, 24 May 2008) | 1 line

  Fixed an import that remained from the lib-tk -> tkinter -> lib-tk renaming
........
  r63589 | georg.brandl | 2008-05-24 20:31:28 +0200 (Sat, 24 May 2008) | 3 lines

  socketserver renaming reversal part 3: move the module into the right
  place and fix all references to it.  Closes #2926.
........
  r63611 | georg.brandl | 2008-05-25 09:46:33 +0200 (Sun, 25 May 2008) | 2 lines

  Hint about _winreg renaming in the docs.
........
  r63630 | georg.brandl | 2008-05-25 14:34:57 +0200 (Sun, 25 May 2008) | 2 lines

  Add renaming notices to thread and dummy_thread.
........

........
  r63493 | georg.brandl | 2008-05-20 09:49:57 +0200 (Tue, 20 May 2008) | 2 lines

  Revert copy_reg -> copyreg rename.
........
  r63494 | georg.brandl | 2008-05-20 09:52:27 +0200 (Tue, 20 May 2008) | 2 lines

  Remove directories that no longer exist.
........
  r63495 | georg.brandl | 2008-05-20 09:58:42 +0200 (Tue, 20 May 2008) | 2 lines

  Remove html package and fix test_htmlparser.
........

........
  r63415 | georg.brandl | 2008-05-17 20:17:45 +0200 (Sat, 17 May 2008) | 3 lines

  Don't export a name "tkinter" from the "tkinter" package.
  Else people doing "from tkinter import *" will get a nasty surprise.
........
  r63421 | georg.brandl | 2008-05-17 21:06:20 +0200 (Sat, 17 May 2008) | 2 lines

  Add "tkinter" to the list of directories to install.
........
  r63422 | georg.brandl | 2008-05-17 21:14:23 +0200 (Sat, 17 May 2008) | 2 lines

  Add new tkinter dir to various locations where lib-tk shows up.
........

........
  r63630 | georg.brandl | 2008-05-25 14:34:57 +0200 (Sun, 25 May 2008) | 2 lines

  Add renaming notices to thread and dummy_thread.
........

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

................
  r63634 | martin.v.loewis | 2008-05-25 16:58:01 +0200 (So, 25 Mai 2008) | 81 lines

  Merged revisions 62647-63633 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r63047 | alexandre.vassalotti | 2008-05-11 11:03:24 +0200 (So, 11 Mai 2008) | 2 lines

    Added import fixer for copy_reg rename.
  ........
    r63081 | alexandre.vassalotti | 2008-05-11 22:06:36 +0200 (So, 11 Mai 2008) | 2 lines

    Added import fixer for Queue rename.
  ........
    r63090 | alexandre.vassalotti | 2008-05-11 22:38:16 +0200 (So, 11 Mai 2008) | 2 lines

    Added import fixer for PixMapWrapper rename.
  ........
    r63141 | alexandre.vassalotti | 2008-05-12 04:42:03 +0200 (Mo, 12 Mai 2008) | 5 lines

    Added fixer for SocketServer renaming.
    Removed PixMapWrapper fixer, since the module is actually pending
    removal.
  ........
    r63252 | alexandre.vassalotti | 2008-05-15 01:10:20 +0200 (Do, 15 Mai 2008) | 2 lines

    Added fixer for ConfigParser rename.
  ........
    r63321 | collin.winter | 2008-05-15 19:42:58 +0200 (Do, 15 Mai 2008) | 1 line

    Add a missing comma. Fixes issue 2866.
  ........
    r63356 | alexandre.vassalotti | 2008-05-16 08:55:44 +0200 (Fr, 16 Mai 2008) | 4 lines

    Added new tests for fix_imports.
    Added refactoring support of from-import statements of the style:
      from foo import bar, baz
  ........
    r63362 | alexandre.vassalotti | 2008-05-16 09:17:53 +0200 (Fr, 16 Mai 2008) | 2 lines

    Added the repr module import fixer.
  ........
    r63456 | georg.brandl | 2008-05-18 21:51:18 +0200 (So, 18 Mai 2008) | 2 lines

    #2908: fixers for Tkinter rename.
  ........
    r63461 | georg.brandl | 2008-05-18 23:00:20 +0200 (So, 18 Mai 2008) | 2 lines

    Fix for last patch.
  ........
    r63525 | alexandre.vassalotti | 2008-05-21 23:43:29 +0200 (Mi, 21 Mai 2008) | 4 lines

    Add missing comma in fix_imports.

    Bug caught by Quentin Gallet-Gilles.
  ........
    r63532 | brett.cannon | 2008-05-22 05:02:43 +0200 (Do, 22 Mai 2008) | 4 lines

    When testing fix_imports, no need to only test a subset of input; test it all!

    Do all revisions to the sandbox need to be manually applied to the trunk?
  ........
    r63533 | brett.cannon | 2008-05-22 05:16:45 +0200 (Do, 22 Mai 2008) | 1 line

    Add _markupbase to the import fixer.
  ........
    r63612 | georg.brandl | 2008-05-25 09:56:59 +0200 (So, 25 Mai 2008) | 2 lines

    Add fixer for _winreg rename.
  ........
    r63627 | georg.brandl | 2008-05-25 14:30:10 +0200 (So, 25 Mai 2008) | 2 lines

    Add fixer entry for the thread module.
  ........
    r63629 | georg.brandl | 2008-05-25 14:34:13 +0200 (So, 25 Mai 2008) | 2 lines

    Fixer entry for dummy_thread.
  ........
    r63633 | martin.v.loewis | 2008-05-25 16:52:41 +0200 (So, 25 Mai 2008) | 2 lines

    Temporarily disable Test_imports.
  ........
................

Blocked revisions 63599-63600,63603,63605-63607 via svnmerge

........
  r63599 | georg.brandl | 2008-05-25 09:08:35 +0200 (Sun, 25 May 2008) | 2 lines

  Queue renaming reversal part 1: remove stub module.
........
  r63600 | georg.brandl | 2008-05-25 09:10:03 +0200 (Sun, 25 May 2008) | 2 lines

  Queue renaming reversal part 2: move module.
........
  r63603 | georg.brandl | 2008-05-25 09:20:14 +0200 (Sun, 25 May 2008) | 3 lines

  Queue renaming reversal part 3: move module into place and
  change imports and other references. Closes #2925.
........
  r63605 | georg.brandl | 2008-05-25 09:21:41 +0200 (Sun, 25 May 2008) | 2 lines

  ConfigParser renaming reversal part 1: remove stub module.
........
  r63606 | georg.brandl | 2008-05-25 09:21:58 +0200 (Sun, 25 May 2008) | 2 lines

  ConfigParser renaming reversal part 2: move module.
........
  r63607 | georg.brandl | 2008-05-25 09:25:25 +0200 (Sun, 25 May 2008) | 2 lines

  ConfigParser renaming reversal part 3: move module into place and adapt imports.
........

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

........
  r63395 | thomas.heller | 2008-05-16 22:06:31 +0200 (Fr, 16 Mai 2008) | 4 lines

  Issue 1793: Add ctypes.util.find_msvcrt() function (on Windows).
........
  r63396 | thomas.heller | 2008-05-16 22:19:07 +0200 (Fr, 16 Mai 2008) | 4 lines

  Very simple test for ctypes.util.find_library on Windows.
........
  r63511 | thomas.heller | 2008-05-20 21:53:47 +0200 (Di, 20 Mai 2008) | 6 lines

  On HPUX, -fPIC must be used for linking.  _ctypes now builds on HP-UX
  IA64 and PA machines.

  The ctypes unittests work fine on the IA64, but dump core in
  test_qsort on the PA.
........
  r63522 | thomas.heller | 2008-05-21 20:47:02 +0200 (Mi, 21 Mai 2008) | 2 lines

  The -x <test1[,test2...]> flag allows to exclude tests.
........
  r63523 | thomas.heller | 2008-05-21 21:47:44 +0200 (Mi, 21 Mai 2008) | 2 lines

  Oops, get_tests may be called with 3 arguments.
........

........
  r63549 | brett.cannon | 2008-05-22 22:05:20 -0700 (Thu, 22 May 2008) | 1 line

  Remove the old repr stub.
........

........
  r63547 | brett.cannon | 2008-05-22 22:03:59 -0700 (Thu, 22 May 2008) | 1 line

  Revert the renaming of repr to reprlib.
........

........
  r63528 | benjamin.peterson | 2008-05-21 17:52:39 -0500 (Wed, 21 May 2008) | 2 lines

  check for toolbox glue before testing platform.mac_ver intensly
........

rename in r63439.

Also fix one occurrence of unichr() in html.parser.

........
  r63513 | brett.cannon | 2008-05-20 15:08:20 -0700 (Tue, 20 May 2008) | 2 lines

  Add a note about the renaming of test.test_support in 3.0.
........

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)
........