........
  r85811 | r.david.murray | 2010-10-23 18:19:56 -0400 (Sat, 23 Oct 2010) | 2 lines

  #1349106: add linesep argument to generator.flatten and header.encode.
........

with and without --enable-shared on Ubuntu 10.10.  Hopefully this finally
solves bug 10126.  Will check 3.1 and py3k next.

RegDeleteKeyA fails with ERROR_MORE_DATA if the length of 2nd
parameter exceeds 260.

directory to the shared library.  test_distutils now passes when
Python was built with --enable-shared.

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85774 | brian.curtin | 2010-10-21 09:11:48 -0500 (Thu, 21 Oct 2010) | 7 lines

  Fix #10162: Add try/except around _winreg.OpenKey for keys that are
  unreadable by all users, e.g., Flash, Silverlight, and Java keys were
  causing errors.

  We don't currently have a way to grant/deny permissions for a key
  via winreg so there are no tests for this.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85757 | benjamin.peterson | 2010-10-20 16:25:23 -0500 (Wed, 20 Oct 2010) | 1 line

  fix uninitialized struct member #10152
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85744 | ronald.oussoren | 2010-10-20 15:10:12 +0200 (Wed, 20 Oct 2010) | 7 lines

  Fix for issue #7473.

  Without this patch you'll get link errors in some extensions
  (in particular the _curses_panel) one when you try to build
  a 3-way universal framework when you previously installed a
  2-way universal framework using the python.org installer.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85742 | ronald.oussoren | 2010-10-20 14:56:56 +0200 (Wed, 20 Oct 2010) | 8 lines

  Don't lie about the supported architectures in the OSX installer

  Without this patch the i386/x86_64 installer for OSX 10.6
  lies in the ReadMe file and the "Important Information" screen
  of the installer (that is, the installer claims it supports
  the i386 and ppc architectures insetead of the ones it really
  supports)
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85725 | alexander.belopolsky | 2010-10-19 13:43:50 -0400 (Tue, 19 Oct 2010) | 3 lines

  Fixed the docstring for calendar.isleap() function.
  Thanks Boštjan Mejak for the patch.
........

........
  r85047 | hirokazu.yamamoto | 2010-09-28 16:03:40 +0900 | 1 line

  Updated VS8.0 bz2.vcproj with PCBuild/vs9to8.py.
........
  r85316 | hirokazu.yamamoto | 2010-10-08 17:46:30 +0900 | 1 line

  Follows Python/fileutils.c addition.
........
  r85689 | hirokazu.yamamoto | 2010-10-18 21:13:18 +0900 | 3 lines

  Issue #5117: Case normalization was needed on ntpath.relpath(). And
  fixed root directory issue on posixpath.relpath(). (Ported working fixes
  from ntpath)
........

ntpath.relpath().

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85675 | r.david.murray | 2010-10-17 20:15:31 -0400 (Sun, 17 Oct 2010) | 4 lines

  #4499: silence compiler warning on AIX.

  Patch from ActiveState.
........

........
  r85671 | r.david.murray | 2010-10-17 18:46:45 -0400 (Sun, 17 Oct 2010) | 4 lines

  #1343: Add short_empty_elements option to XMLGenerator.

  Patch and tests by Neil Muller.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85665 | benjamin.peterson | 2010-10-17 16:12:18 -0500 (Sun, 17 Oct 2010) | 1 line

  fix strict aliasing warnings
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85657 | gregory.p.smith | 2010-10-17 12:40:59 -0700 (Sun, 17 Oct 2010) | 3 lines

  Remove the external non-python.org hyperlink and point people to
  Tools/gdb/libpython.py.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85649 | gregory.p.smith | 2010-10-17 11:59:56 -0700 (Sun, 17 Oct 2010) | 2 lines

  The py_decref macro was incorrect and unnecessary.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85646 | gregory.p.smith | 2010-10-17 11:38:04 -0700 (Sun, 17 Oct 2010) | 6 lines

  * Applys part of the patch from http://bugs.python.org/issue3631 to add
    a py_decref macro, fixup the pyo macro and reuse it and avoid a memory
    leak introduced by the pylocals macro.
  * Adds a note about gdb 7 python debugging support with links for
    more info on that.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85586 | gregory.p.smith | 2010-10-16 17:17:24 -0700 (Sat, 16 Oct 2010) | 2 lines

  fix for netbsd.
........
  r85587 | gregory.p.smith | 2010-10-16 17:43:10 -0700 (Sat, 16 Oct 2010) | 3 lines

  applying netbsd-wizs-mod.patch from issue5510 -
   fixes for netbsd (and dragonflybsd?)
........
  r85596 | gregory.p.smith | 2010-10-16 19:14:36 -0700 (Sat, 16 Oct 2010) | 6 lines

  Fix multiprocessing Semaphore's on netbsd5. SEM_VALUE_MAX is defined
  as (~0U) on NetBSD which was causing it to appear as -1 when used as
  a signed int for _multprocessing.SemLock.SEM_VALUE_MAX.  This works
  around the problem by substituting INT_MAX on systems where it appears
  negative when used as an int.
........
  r85597 | gregory.p.smith | 2010-10-16 19:57:19 -0700 (Sat, 16 Oct 2010) | 2 lines

  skip test_itimer_virtual on NetBSD to prevent the test suite from hanging.
........
  r85598 | gregory.p.smith | 2010-10-16 20:09:12 -0700 (Sat, 16 Oct 2010) | 2 lines

  Avoid hanging the test on netbsd5.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85589 | benjamin.peterson | 2010-10-16 20:25:19 -0500 (Sat, 16 Oct 2010) | 1 line

  remove rather pointless test
........
  r85590 | benjamin.peterson | 2010-10-16 20:29:11 -0500 (Sat, 16 Oct 2010) | 1 line

  disable the garbage collector while collecting traces, so that __del__s don't get caught
........
  r85591 | benjamin.peterson | 2010-10-16 20:30:26 -0500 (Sat, 16 Oct 2010) | 1 line

  use assertion methods
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85562 | benjamin.peterson | 2010-10-15 22:45:45 -0500 (Fri, 15 Oct 2010) | 1 line

  don't identify the toplevel namespace by name #9997
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85554 | r.david.murray | 2010-10-15 19:12:57 -0400 (Fri, 15 Oct 2010) | 4 lines

  #9862: On AIX PIPE_BUF is broken.  Make it 512.

  Patch by Sébastien Sablé.
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85543 | georg.brandl | 2010-10-15 19:03:02 +0200 (Fr, 15 Okt 2010) | 1 line

  #4785: document strict argument of JSONDecoder, plus add object_pairs_hook in the docstrings.
........

Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line

  wrap with parens
........
  r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line

  use parens
........
  r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line

  things which use touch_import should be pre order
........
  r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines

  This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
........
  r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line

  allow star_expr in testlist_gexp
........
  r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line

  wrap long line
........
  r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line

  cleanup
........
  r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line

  when there's a None value and a traceback, don't call type with it #9661
........
  r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines

  Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
........
  r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line

  fix urllib fixer with multiple as imports on a line #10069
........
  r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line

  stop abusing docstrings
........
  r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line

  kill sibling import
........
  r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line

  remove trailing whitespace
........
  r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line

  typo
........

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85503 | antoine.pitrou | 2010-10-15 00:11:44 +0200 (ven., 15 oct. 2010) | 2 lines

  More proper closing of files
........

Recorded merge of revisions 85495,85500 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85495 | florent.xicluna | 2010-10-14 22:56:20 +0200 (jeu., 14 oct. 2010) | 3 lines

  Fix the regex to match all kind of filenames, for interactive debugging in doctests. (issue #9409)
........
  r85500 | florent.xicluna | 2010-10-14 23:35:58 +0200 (jeu., 14 oct. 2010) | 2 lines

  Add test case for issue #9409, non-ascii char in doctest.  It passes in 3.2 but needs fixing in 2.7.
........