Merged revisions 67948-67950 via svnmerge from

Merged revisions 67948-67950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r67948 | benjamin.peterson | 2008-12-27 10:00:54 -0600 (Sat, 27 Dec 2008) | 93 lines

  Merged revisions 67889-67892,67895,67898,67904-67907,67912,67918,67920-67921,67923-67924,67926-67927,67930,67943 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ................
    r67889 | benjamin.peterson | 2008-12-20 19:04:32 -0600 (Sat, 20 Dec 2008) | 1 line

    sphinx.web is long gone
  ................
    r67890 | benjamin.peterson | 2008-12-20 19:12:26 -0600 (Sat, 20 Dec 2008) | 1 line

    update readme
  ................
    r67891 | benjamin.peterson | 2008-12-20 19:14:47 -0600 (Sat, 20 Dec 2008) | 1 line

    there are way too many places which need to have the current version added
  ................
    r67892 | benjamin.peterson | 2008-12-20 19:29:32 -0600 (Sat, 20 Dec 2008) | 9 lines

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

    ........
      r67809 | benjamin.peterson | 2008-12-15 21:54:45 -0600 (Mon, 15 Dec 2008) | 1 line

      fix logic error
    ........
  ................
    r67895 | neal.norwitz | 2008-12-21 08:28:32 -0600 (Sun, 21 Dec 2008) | 2 lines

    Add Tarek for work on distutils.
  ................
    r67898 | benjamin.peterson | 2008-12-21 15:00:53 -0600 (Sun, 21 Dec 2008) | 1 line

    compute DISTVERSION with patchlevel.py
  ................
    r67904 | benjamin.peterson | 2008-12-22 14:44:58 -0600 (Mon, 22 Dec 2008) | 1 line

    less attitude
  ................
    r67905 | benjamin.peterson | 2008-12-22 14:51:15 -0600 (Mon, 22 Dec 2008) | 1 line

    fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
  ................
    r67906 | benjamin.peterson | 2008-12-22 14:52:53 -0600 (Mon, 22 Dec 2008) | 1 line

    add NEWS note
  ................
    r67907 | benjamin.peterson | 2008-12-22 16:12:19 -0600 (Mon, 22 Dec 2008) | 1 line

    silence compiler warning
  ................
    r67912 | georg.brandl | 2008-12-23 06:37:21 -0600 (Tue, 23 Dec 2008) | 2 lines

    Fix missing "svn" command.
  ................
    r67918 | georg.brandl | 2008-12-23 09:44:25 -0600 (Tue, 23 Dec 2008) | 2 lines

    Markup fix.
  ................
    r67920 | benjamin.peterson | 2008-12-23 14:09:28 -0600 (Tue, 23 Dec 2008) | 1 line

    use a global variable, so the compiler doesn't optimize the assignment out
  ................
    r67921 | benjamin.peterson | 2008-12-23 14:12:33 -0600 (Tue, 23 Dec 2008) | 1 line

    make global static
  ................
    r67923 | benjamin.peterson | 2008-12-24 09:10:27 -0600 (Wed, 24 Dec 2008) | 1 line

    #4736 BufferRWPair.closed shouldn't try to call another property as a function
  ................
    r67924 | benjamin.peterson | 2008-12-24 10:10:05 -0600 (Wed, 24 Dec 2008) | 1 line

    pretend exceptions don't exist a while longer
  ................
    r67926 | tarek.ziade | 2008-12-24 13:10:05 -0600 (Wed, 24 Dec 2008) | 1 line

    fixed #4400 : distutils .pypirc default generated file was broken.
  ................
    r67927 | benjamin.peterson | 2008-12-26 17:26:30 -0600 (Fri, 26 Dec 2008) | 1 line

    python version is included in file name now
  ................
    r67930 | hirokazu.yamamoto | 2008-12-26 22:19:48 -0600 (Fri, 26 Dec 2008) | 2 lines

    Issue #4740: Use HIGHEST_PROTOCOL in pickle test.
    (There is no behavior difference in 2.x because HIGHEST_PROTOCOL == 2)
  ................
    r67943 | alexandre.vassalotti | 2008-12-27 04:02:59 -0600 (Sat, 27 Dec 2008) | 2 lines

    Fix bogus unicode tests in pickletester.
  ................
................
  r67949 | benjamin.peterson | 2008-12-27 10:58:50 -0600 (Sat, 27 Dec 2008) | 1 line

  fix syntax
................
  r67950 | benjamin.peterson | 2008-12-27 11:00:44 -0600 (Sat, 27 Dec 2008) | 1 line

  fix 2.x isms in distutils test
................