Blocked revisions 64062,64068-64069,64080 via svnmerge

........
  r64062 | josiah.carlson | 2008-06-10 00:00:08 -0500 (Tue, 10 Jun 2008) | 5 lines

  Applying updated patch from Issue 1736190, which addresses partial
  issues in: 909005 and 17361001, as well as completely as possible issues
  539444, 760475, 777588, 889153, 953599, 1025525, 1063924, and 658749.
  This patch also includes doc and test updates as necessary.
........
  r64068 | benjamin.peterson | 2008-06-10 08:37:13 -0500 (Tue, 10 Jun 2008) | 2 lines

  fix markup
........
  r64069 | georg.brandl | 2008-06-10 08:53:24 -0500 (Tue, 10 Jun 2008) | 2 lines

  more markup fix.
........
  r64080 | josiah.carlson | 2008-06-10 10:58:19 -0500 (Tue, 10 Jun 2008) | 3 lines

  Fixed test to reflect new filedispatcher semantics, as well as two
  NameErrors pointed out by Giampaolo.
........

........
  r64865 | brett.cannon | 2008-07-10 17:48:57 -0700 (Thu, 10 Jul 2008) | 1 line

  Doc that robotparse has been renamed urllib.robotparser in Python 3.0.
........
  r64866 | brett.cannon | 2008-07-10 17:50:01 -0700 (Thu, 10 Jul 2008) | 1 line

  Fix a minor typo in the last entry made.
........

........
  r64861 | brett.cannon | 2008-07-10 17:16:30 -0700 (Thu, 10 Jul 2008) | 1 line

  Doc that urlparse is named urllib.parse in Python 3.0.
........

........
  r64858 | brett.cannon | 2008-07-10 17:10:49 -0700 (Thu, 10 Jul 2008) | 2 lines

  Removal an invalid entry as the fixer for urllib is under active development.
........
  r64859 | brett.cannon | 2008-07-10 17:12:52 -0700 (Thu, 10 Jul 2008) | 3 lines

  Document the fact that urllib2 spans multiple modules with new names in Python
  3.0.
........

........
  r64791 | nick.coghlan | 2008-07-09 00:08:04 +1000 (Wed, 09 Jul 2008) | 1 line

  Issue 2517: Allow unicode messages in Exceptions again by correctly bypassing the instance dictionary when looking up __unicode__ on new-style classes
........

to the py3k branch.

for smtpd, which required updating with the new semantics.

........
  r64762 | amaury.forgeotdarc | 2008-07-06 23:34:39 +0200 (dim., 06 juil. 2008) | 8 lines

  Issue839496: SimpleHTTPServer should open all files in binary mode.

  Forward-port of 38255 (2005/01/15!)
  This was already fixed in 2.4, but never merged into trunk...
  py3k is already right, thanks to the bytes/str distinction!

  Should be backported to 2.5.
........

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

................
  r64736 | martin.v.loewis | 2008-07-05 17:45:45 +0200 (Sa, 05 Jul 2008) | 20 lines

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

  ........
    r64493 | benjamin.peterson | 2008-06-24 04:14:14 +0200 (Di, 24 Jun 2008) | 1 line

    add a fix_import mapping for cPickle -> pickle
  ........
    r64651 | brett.cannon | 2008-07-02 04:00:11 +0200 (Mi, 02 Jul 2008) | 3 lines

    Update fix_imports for urllib. Had to change the fixer itself to handle modules
    that are split across several renames in 3.0.
  ........
    r64669 | brett.cannon | 2008-07-02 21:43:48 +0200 (Mi, 02 Jul 2008) | 4 lines

    Backing out last change until fix_imports is working again. Also re-enable the
    testing for fix_imports; if it is deemed that it takes too long to run then a
    random sample should be taken and used to test it.
  ........
................
  r64737 | martin.v.loewis | 2008-07-05 17:48:20 +0200 (Sa, 05 Jul 2008) | 2 lines

  Disable lib2to3 by default, unless run explicitly.
................

even on "narrow Unicode" builds; the result is a pair of UTF-16 surrogates.

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

........
  r64688 | martin.v.loewis | 2008-07-03 14:51:14 +0200 (Do, 03 Jul 2008) | 9 lines

  Patch #1622: Correct interpretation of various ZIP header fields.

  Also fixes
  - Issue #1526: Allow more than 64k files to be added to Zip64 file.

  - Issue #1746: Correct handling of zipfile archive comments (previously
    archives with comments over 4k were flagged as invalid). Allow writing
    Zip files with archives by setting the 'comment' attribute of a ZipFile.
........

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

........
  r64685 | amaury.forgeotdarc | 2008-07-03 01:40:28 +0200 (Thu, 03 Jul 2008) | 3 lines

  Try a blind fix to nismodule which fails on the solaris10 3.0 buildbot:
  the GIL must be re-acquired in the callback function
........

Remove references in documentation;
also rewrite a paragraph that looked off-topic to me.

Third step: unix-only modules. Really remove the function this time.

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

........
  r64677 | brett.cannon | 2008-07-02 14:52:42 -0700 (Wed, 02 Jul 2008) | 2 lines

  Revert r64673 and instead just change the file encoding.
........

Second step: keep tp_getattr functions when they are complex,
but use PyObject_GenericGetAttr() as a fallback.

These were the last occurrences of Py_FindMethod.

Otherwise dir(_sre.SRE_Match) returns an empty list.

First step: handle most occurrences, remove tp_getattr and fill the tp_methods and tp_members slots.
Add some test about attribute access.