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

................
  r80934 | benjamin.peterson | 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) | 69 lines

  Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line

    use absolute import
  ........
    r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line

    generalize detection of __future__ imports and attach them to the tree
  ........
    r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line

    don't try to 'fix' relative imports when absolute_import is enabled #8858
  ........
    r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines

    prevent diffs from being mangled is multiprocess mode #6409

    Patch by George Boutsioukis.
  ........
    r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line

    remove unhelpful description
  ........
    r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line

    use unicode literals
  ........
    r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines

    Don't transform imports that are already relative.  2to3 turned
      from . import refactor
    into
      from .. import refactor
    which broke the transformation of 2to3 itself.
  ........
    r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line

    remove imports
  ........
    r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line

    unicode literal
  ........
    r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line

    must pass a string to Number
  ........
    r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line

    unicode literals
  ........
    r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line

    pass string to Number
  ........
    r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines

    Make 2to3 run under Python 2.5 so that the benchmark suite at
    http://hg.python.org/benchmarks/ can use it and still run on implementations
    that haven't gotten to 2.6 yet.  Fixes issue 8566.
  ........
    r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line

    prevent xrange transformation from wrapping range calls it produces in list
  ........
................

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

........
  r80932 | michael.foord | 2010-05-07 20:16:19 +0200 (Fri, 07 May 2010) | 1 line

  Issue 8547 - detecting and reporting that modules have been imported from the wrong location under test discovery.
........

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

........
  r80926 | antoine.pitrou | 2010-05-07 18:50:34 +0200 (ven., 07 mai 2010) | 5 lines

  Issue #8571: Fix an internal error when compressing or decompressing a
  chunk larger than 1GB with the zlib module's compressor and decompressor
  objects.
........

"surrogateescape") by PyUnicode_DecodeFSDefault(val).

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

........
  r80920 | michael.foord | 2010-05-07 17:52:05 +0200 (Fri, 07 May 2010) | 1 line

  Adding tests for unittest command line handling of buffer, catchbreak and failfast.
........

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

........
  r80918 | michael.foord | 2010-05-07 17:34:08 +0200 (Fri, 07 May 2010) | 1 line

  Adding a test for unittest test discovery with dotted path name.
........

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

........
  r80908 | senthil.kumaran | 2010-05-07 09:37:29 +0530 (Fri, 07 May 2010) | 3 lines

  Testsuite for RFC3986 based parsing scenario. Related Issue1462525.
........

See issue #8533 (problem with newlines on Windows).

Avoid useless encode/decode of the filename

Avoid useless unicode decoding/recoding of the filename.

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

........
  r80894 | benjamin.peterson | 2010-05-06 17:33:46 -0500 (Thu, 06 May 2010) | 1 line

  Availability gets its own line
........
  r80896 | benjamin.peterson | 2010-05-06 17:49:28 -0500 (Thu, 06 May 2010) | 1 line

  ensure that availability information is on its own line at the end of the function docs
........

Create os.environb mapping and os.getenvb() function, os.unsetenv() encodes str
argument to the file system encoding with the surrogateescape error handler
(instead of utf8/strict) and accepts bytes, and posix.environ keys and values
are bytes.

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

........
  r80882 | giampaolo.rodola | 2010-05-06 22:19:32 +0200 (gio, 06 mag 2010) | 1 line

  adds handle_error(self):raise to test modules using asyncore to provide a clearer error message in case something goes wrong
........

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

........
  r80880 | giampaolo.rodola | 2010-05-06 21:56:34 +0200 (gio, 06 mag 2010) | 1 line

  provides a clearer warning message when cheap inheritance with the underlying socket object is used
........

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

........
  r80875 | giampaolo.rodola | 2010-05-06 19:57:06 +0200 (gio, 06 mag 2010) | 1 line

  Fix asyncore issues 8573 and 8483: _strerror might throw ValueError; asyncore.__getattr__ cheap inheritance caused confusing error messages when accessing undefined class attributes; added an alias for __str__ which now is used as a fallback for __repr__
........

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

........
  r80869 | antoine.pitrou | 2010-05-06 16:11:23 +0200 (jeu., 06 mai 2010) | 3 lines

  `self` doesn't exist here
........

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

........
  r80857 | brian.curtin | 2010-05-05 21:54:44 -0500 (Wed, 05 May 2010) | 5 lines

  Fix #7863. Properly identify Windows 7 and Server 2008 R2.

  Removed various unused code and added a way to correctly determine
  server vs. workstation via the registry.
........

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

It turns out that email5 (py3k), because it is using unicode for the
payload, doesn't do the encoding to the output character set until later
in the process.  Specifically, charset.body_encode no longer does the
input-to-output charset conversion.  So the if test in the exception
clause in encoders.encode_7or8bit really is needed in email5.

So, this merge only merges the test, not the removal of the 'if'.

........
  r80800 | r.david.murray | 2010-05-05 13:31:03 -0400 (Wed, 05 May 2010) | 9 lines

  Issue #7472: remove unused code from email.encoders.encode_7or8bit.

  Yukihiro Nakadaira noticed a typo in encode_7or8bit that was trying
  to special case iso-2022 codecs.  It turns out that the code in
  question is never used, because whereas it was designed to trigger
  if the payload encoding was eight bit but its output encoding was
  7 bit, in practice the payload is always converted to the 7bit
  encoding before encode_7or8bit is called.  Patch by Shawat Anand.
........

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

........
  r80849 | r.david.murray | 2010-05-05 20:59:04 -0400 (Wed, 05 May 2010) | 4 lines

  Have the serve.py script announce the directory it is
  serving and which port it is serving it on (I can
  never remember the default port number it uses...)
........

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

........
  r80844 | victor.stinner | 2010-05-06 01:33:33 +0200 (jeu., 06 mai 2010) | 5 lines

  Untabify Modules/posixmodule.c

  Run Antoine Pitrou "untabify" script + manual editions (OS/2 and some
  continuation lines).
........
  r80845 | victor.stinner | 2010-05-06 02:03:44 +0200 (jeu., 06 mai 2010) | 4 lines

  Untabify Modules/posixmodule.c (2)

  Fix some more functions by hand
........

I rewrote the patch for py3k from scratch using untabify + manual editions

........
  r80839 | mark.dickinson | 2010-05-05 23:42:51 +0100 (Wed, 05 May 2010) | 3 lines

  Issue #1533:  test_range in test_builtin: fix test comment and add test
  for rejection of small floats.  Thanks Alexander Belopolsky.
........

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

........
  r80837 | tarek.ziade | 2010-05-06 00:41:25 +0200 (Thu, 06 May 2010) | 1 line

  removed non needed lines
........

doesn't need to be merged.)  Patch by Alexander Belopolsky.

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

........
  r80832 | mark.dickinson | 2010-05-05 23:23:58 +0100 (Wed, 05 May 2010) | 2 lines

  Issue #8625:  Turn off gcc optimization in debug builds.
........

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

........
  r80830 | tarek.ziade | 2010-05-06 00:15:31 +0200 (Thu, 06 May 2010) | 1 line

  Fixed #4265: shutil.copyfile() was leaking file descriptors when disk fills
........

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

........
  r80826 | mark.dickinson | 2010-05-05 22:52:39 +0100 (Wed, 05 May 2010) | 1 line

  Issue 8628: fix incorrect documentation for numbers.Complex.imag.
........

(instead of replace in read mode or strict in write mode)

........
  r80804 | ronald.oussoren | 2010-05-05 21:09:31 +0200 (Wed, 05 May 2010) | 8 lines

  In a number of places code still revers
  to "sys.platform == 'mac'" and that is
  dead code because it refers to a platform
  that is no longer supported (and hasn't been
  supported for several releases).

  Fixes issue #7908 for the trunk.
........

Fix for issue #7908

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

........
  r80802 | antoine.pitrou | 2010-05-05 20:29:02 +0200 (mer., 05 mai 2010) | 3 lines

  Issue #8600: fix test_gdb failures when gdb issues some spurious warnings.
........

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

........
  r80796 | antoine.pitrou | 2010-05-05 18:27:30 +0200 (mer., 05 mai 2010) | 3 lines

  Untabify Modules/_io/fileio.c
........