Blocked revisions 67810,67886-67887,67910,67941,67945,67947 via svnmerge

Blocked revisions 67810,67886-67887,67910,67941,67945,67947 via svnmerge

................
  r67810 | benjamin.peterson | 2008-12-16 04:57:54 +0100 (Tue, 16 Dec 2008) | 118 lines

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

  ................
    r67806 | benjamin.peterson | 2008-12-15 21:35:28 -0600 (Mon, 15 Dec 2008) | 111 lines

    Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
    svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

    ........
      r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line

      fix spelling in comment
    ........
      r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line

      add a scripts directory; move things to it
    ........
      r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line

      run svneol.py
    ........
      r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line

      rename pre/post_order_mapping to pre/post_order_heads
    ........
      r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines

      Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
    ........
      r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines

      Added a fixer that cleans up a tuple argument to isinstance after the tokens
      in it were fixed.  This is mainly used to remove double occurrences of
      tokens as a leftover of the long -> int / unicode -> str conversion.
    ........
      r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines

      Added missing copyright fo 2to3 fix_isinstance.
    ........
      r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines

      2to3: intern and reduce fixes now add the imports if missing.  Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
    ........
      r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line

      copy permission bits when making backup files #4602
    ........
      r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line

      add forgotten import
    ........
      r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line

      fix #4602 for real
    ........
      r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines

      Removed redudant code from the 2to3 long fixer.  This fixes #4590.
    ........
      r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line

      put trailers after a range call after the list()
    ........
      r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line

      add html related modules to the fix_imports mapping
    ........
      r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line

      consolidate tests
    ........
      r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line

      fix name
    ........
      r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line

      run fix_isinstance after fix_long and fix_unicode
    ........
      r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line

      use run_order instead of order
    ........
      r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line

      don't retain parenthesis if there is only one item left
    ........
      r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line

      use insert_child()
    ........
      r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line

      parenthesize doesn't belong in pygram or FixerBase
    ........
      r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines

      Fix typo: html.paser -> html.parser.
    ........
      r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line

      altering .children needs to call changed()
    ........
      r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line

      employ an evil hack to fix multiple names in the same import statement
    ........
      r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line

      make a common mixin class for Test_imports and friends
    ........
      r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines

      Make fix_imports refactor multiple imports as.
    ........
  ................
................
  r67886 | benjamin.peterson | 2008-12-21 01:06:59 +0100 (Sun, 21 Dec 2008) | 93 lines

  Merged revisions 67654,67676-67677,67681,67692,67725,67761,67784-67785,67787-67788,67802,67848-67850,67862-67864,67880,67882 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r67654 | georg.brandl | 2008-12-07 16:42:09 -0600 (Sun, 07 Dec 2008) | 2 lines

    #4457: rewrite __import__() documentation.
  ........
    r67676 | benjamin.peterson | 2008-12-08 20:03:03 -0600 (Mon, 08 Dec 2008) | 1 line

    specify how things are copied
  ........
    r67677 | benjamin.peterson | 2008-12-08 20:05:11 -0600 (Mon, 08 Dec 2008) | 1 line

    revert unrelated change to installer script
  ........
    r67681 | jeremy.hylton | 2008-12-09 15:03:10 -0600 (Tue, 09 Dec 2008) | 2 lines

    Add simple unittests for Request
  ........
    r67692 | amaury.forgeotdarc | 2008-12-10 18:03:42 -0600 (Wed, 10 Dec 2008) | 2 lines

    #1030250: correctly pass the dry_run option to the mkpath() function.
  ........
    r67725 | benjamin.peterson | 2008-12-12 22:02:20 -0600 (Fri, 12 Dec 2008) | 1 line

    fix incorrect example
  ........
    r67761 | benjamin.peterson | 2008-12-14 11:26:04 -0600 (Sun, 14 Dec 2008) | 1 line

    fix missing bracket
  ........
    r67784 | georg.brandl | 2008-12-15 02:33:58 -0600 (Mon, 15 Dec 2008) | 2 lines

    #4446: document "platforms" argument for setup().
  ........
    r67785 | georg.brandl | 2008-12-15 02:36:11 -0600 (Mon, 15 Dec 2008) | 2 lines

    #4611: fix typo.
  ........
    r67787 | georg.brandl | 2008-12-15 02:58:59 -0600 (Mon, 15 Dec 2008) | 2 lines

    #4578: fix has_key() usage in compiler package.
  ........
    r67788 | georg.brandl | 2008-12-15 03:07:39 -0600 (Mon, 15 Dec 2008) | 2 lines

    #4568: remove limitation in varargs callback example.
  ........
    r67802 | amaury.forgeotdarc | 2008-12-15 16:29:14 -0600 (Mon, 15 Dec 2008) | 4 lines

    #3632: the "pyo" macro from gdbinit can now run when the GIL is released.

    Patch by haypo.
  ........
    r67848 | benjamin.peterson | 2008-12-18 20:28:56 -0600 (Thu, 18 Dec 2008) | 1 line

    fix typo
  ........
    r67849 | benjamin.peterson | 2008-12-18 20:31:35 -0600 (Thu, 18 Dec 2008) | 1 line

    _call_method -> _callmethod and _get_value to _getvalue
  ........
    r67850 | raymond.hettinger | 2008-12-19 03:06:07 -0600 (Fri, 19 Dec 2008) | 9 lines

    Fix-up and clean-up docs for int.bit_length().

    * Replace dramatic footnote with in-line comment about possible round-off errors in logarithms of large numbers.
    * Add comments to the pure python code equivalent.
    * replace floor() with int() in the mathematical equivalent so the type is correct (should be an int, not a float).
    * add abs() to the mathematical equivalent so that it matches the previous line that it is supposed to be equivalent to.
    * make one combined example with a negative input.
  ........
    r67862 | benjamin.peterson | 2008-12-19 20:48:02 -0600 (Fri, 19 Dec 2008) | 1 line

    copy sentence from docstring
  ........
    r67863 | benjamin.peterson | 2008-12-19 20:51:26 -0600 (Fri, 19 Dec 2008) | 1 line

    add headings
  ........
    r67864 | benjamin.peterson | 2008-12-19 20:57:19 -0600 (Fri, 19 Dec 2008) | 1 line

    beef up docstring
  ........
    r67880 | benjamin.peterson | 2008-12-20 16:49:24 -0600 (Sat, 20 Dec 2008) | 1 line

    remove redundant sentence
  ........
    r67882 | benjamin.peterson | 2008-12-20 16:59:49 -0600 (Sat, 20 Dec 2008) | 1 line

    add some recent releases to the list
  ........
................
  r67887 | benjamin.peterson | 2008-12-21 01:16:13 +0100 (Sun, 21 Dec 2008) | 9 lines

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

  ........
    r67885 | benjamin.peterson | 2008-12-20 17:48:54 -0600 (Sat, 20 Dec 2008) | 1 line

    silence annoying DeprecationWarning
  ........
................
  r67910 | skip.montanaro | 2008-12-23 04:51:14 +0100 (Tue, 23 Dec 2008) | 11 lines

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

  ........
    r67908 | skip.montanaro | 2008-12-22 21:30:15 -0600 (Mon, 22 Dec 2008) | 4 lines

    As a result of a regression that snuck into 2.5.3 add a test case that
    ensures that when you try to read from a file opened for writing an IOError
    is raised.
  ........
................
  r67941 | alexandre.vassalotti | 2008-12-27 10:49:09 +0100 (Sat, 27 Dec 2008) | 2 lines

  Fix bogus assertion.
................
  r67945 | hirokazu.yamamoto | 2008-12-27 15:58:17 +0100 (Sat, 27 Dec 2008) | 1 line

  Fixed incompatible pointer warning.
................
  r67947 | antoine.pitrou | 2008-12-27 16:50:40 +0100 (Sat, 27 Dec 2008) | 10 lines

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

  ........
    r67946 | antoine.pitrou | 2008-12-27 16:43:12 +0100 (sam., 27 d?\195?\169c. 2008) | 4 lines

    Issue #4756: zipfile.is_zipfile() now supports file-like objects.
    Patch by Gabriel Genellina.
  ........
................