Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64623 | benjamin.peterson | 2008-07-01 21:51:54 +0200 (Tue, 01 Jul 2008) | 1 line

  write a short little section for multiprocessing; it still needs help
........
  r64640 | georg.brandl | 2008-07-01 22:56:03 +0200 (Tue, 01 Jul 2008) | 2 lines

  Add a comment about incref'ing w.
........
  r64665 | jesse.noller | 2008-07-02 18:56:51 +0200 (Wed, 02 Jul 2008) | 1 line

  Add #!/usr/bin/env python for ben
........
  r64687 | andrew.kuchling | 2008-07-03 14:50:03 +0200 (Thu, 03 Jul 2008) | 1 line

  Tweak wording
........
  r64689 | benjamin.peterson | 2008-07-03 14:57:35 +0200 (Thu, 03 Jul 2008) | 1 line

  lowercase glossary term
........
  r64690 | benjamin.peterson | 2008-07-03 15:01:17 +0200 (Thu, 03 Jul 2008) | 1 line

  let the term be linked
........
  r64719 | raymond.hettinger | 2008-07-05 04:11:55 +0200 (Sat, 05 Jul 2008) | 1 line

  Update comment on prediction macros.
........
  r64721 | georg.brandl | 2008-07-05 12:07:18 +0200 (Sat, 05 Jul 2008) | 2 lines

  Fix tabs.
........
  r64735 | mark.dickinson | 2008-07-05 17:25:48 +0200 (Sat, 05 Jul 2008) | 3 lines

  Minor rewrite of cmath_log to work around a Sun compiler bug.  See issue
  #3168.
........
  r64742 | benjamin.peterson | 2008-07-05 18:29:38 +0200 (Sat, 05 Jul 2008) | 1 line

  make regrtest aware of the lib2to3 resource
........
  r64744 | georg.brandl | 2008-07-05 18:43:45 +0200 (Sat, 05 Jul 2008) | 2 lines

  Keep below 80 chars.
........
  r64745 | facundo.batista | 2008-07-05 21:19:50 +0200 (Sat, 05 Jul 2008) | 3 lines


  Issue 3289.  Removed two lines that ended doing nothing.
........
  r64746 | facundo.batista | 2008-07-05 22:39:59 +0200 (Sat, 05 Jul 2008) | 4 lines


  Issue #3239. Differentiate the ascii call from the curses one and
  the builtin one.
........
  r64756 | gregory.p.smith | 2008-07-06 09:16:40 +0200 (Sun, 06 Jul 2008) | 3 lines

  - Issue #2113: Fix error in subprocess.Popen if the select system call is
    interrupted by a signal.
........
  r64757 | benjamin.peterson | 2008-07-06 14:39:09 +0200 (Sun, 06 Jul 2008) | 1 line

  remove test_compact_freelists from test_sys
........
  r64758 | gregory.p.smith | 2008-07-06 19:06:29 +0200 (Sun, 06 Jul 2008) | 2 lines

  fix issue3304 - remove an incorrect PyMem_Free in fileio_init
........
  r64759 | georg.brandl | 2008-07-06 19:36:20 +0200 (Sun, 06 Jul 2008) | 2 lines

  Fix opensearch template.
........
  r64760 | andrew.kuchling | 2008-07-06 19:43:16 +0200 (Sun, 06 Jul 2008) | 1 line

  Wording fix
........
  r64761 | andrew.kuchling | 2008-07-06 19:44:17 +0200 (Sun, 06 Jul 2008) | 1 line

  Add two items; rewrap paragraph
........
  r64767 | gregory.p.smith | 2008-07-07 06:31:58 +0200 (Mon, 07 Jul 2008) | 4 lines

  - Issue #3309: Fix bz2.BZFile itererator to release its internal lock
    properly when raising an exception due to the bz2file being closed.
    Prevents a deadlock.
........
  r64768 | josiah.carlson | 2008-07-07 06:51:46 +0200 (Mon, 07 Jul 2008) | 2 lines

  Fixed bugs 760475, 953599, and 1519.
........
  r64769 | gregory.p.smith | 2008-07-07 06:54:31 +0200 (Mon, 07 Jul 2008) | 2 lines

  Add commented out #_sha256 and #_sha512 lines per issue 3183.
........
  r64771 | gregory.p.smith | 2008-07-07 07:09:12 +0200 (Mon, 07 Jul 2008) | 4 lines

  - Issue #3094: httplib.HTTPSConnection Host: headers no longer include the
    redundant ":443" port number designation when the connection is using the
    default https port (443).
........
  r64772 | skip.montanaro | 2008-07-07 13:16:14 +0200 (Mon, 07 Jul 2008) | 2 lines

  Correct grammar.
........
  r64774 | andrew.kuchling | 2008-07-07 18:51:09 +0200 (Mon, 07 Jul 2008) | 1 line

  Fix example to match text
........
  r64775 | facundo.batista | 2008-07-07 19:02:59 +0200 (Mon, 07 Jul 2008) | 3 lines


  Issue 3306. Better control for a lenght in findmax() function.
........
  r64788 | georg.brandl | 2008-07-08 09:05:23 +0200 (Tue, 08 Jul 2008) | 2 lines

  Add missing ABCs to list.
........
  r64793 | nick.coghlan | 2008-07-08 16:21:42 +0200 (Tue, 08 Jul 2008) | 1 line

  Add missing NEWS and ACK entries for r64791
........
  r64835 | raymond.hettinger | 2008-07-10 11:31:08 +0200 (Thu, 10 Jul 2008) | 1 line

  Issue 3287: Raise correct exception for float inputs.
........
  r64836 | raymond.hettinger | 2008-07-10 12:28:41 +0200 (Thu, 10 Jul 2008) | 1 line

  Use operator.index() instead of n.__index__().
........

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

........
  r64446 | facundo.batista | 2008-06-21 19:43:56 +0200 (Sat, 21 Jun 2008) | 4 lines


  Fixed issue #2888. Now the behaviour of pprint when working with nested
  structures follows the common sense (and works like in 2.5 and 3.0).
........
  r64490 | thomas.heller | 2008-06-23 21:51:41 +0200 (Mon, 23 Jun 2008) | 1 line

  Include debug info when assembling win64.asm in a debug build.
........
  r64495 | benjamin.peterson | 2008-06-24 04:41:08 +0200 (Tue, 24 Jun 2008) | 1 line

  minor fix
........
  r64526 | mark.dickinson | 2008-06-25 17:29:32 +0200 (Wed, 25 Jun 2008) | 2 lines

  issue #3199: Fix typo in Mac/Makefile.in
........
  r64567 | mark.dickinson | 2008-06-28 00:20:14 +0200 (Sat, 28 Jun 2008) | 3 lines

  Fix typo in configure.in, and propagate configure.in changes from r64002
  to configure and pyconfig.h.in.
........

........
  r64453 | andrew.kuchling | 2008-06-22 15:39:11 +0200 (Sun, 22 Jun 2008) | 1 line

  Wording fix
........
  r64471 | facundo.batista | 2008-06-23 01:19:14 +0200 (Mon, 23 Jun 2008) | 5 lines


  Fixing the problem stated in issue 2702 with the patch submitted
  in the issue 3165. Now cPickle does not fails with uncontrolled
  behaviour when pickling into a very deep nested structure.
........
  r64489 | thomas.heller | 2008-06-23 16:49:56 +0200 (Mon, 23 Jun 2008) | 2 lines

  Fix compilation on Windows.
........
  r64527 | facundo.batista | 2008-06-25 21:24:53 +0200 (Wed, 25 Jun 2008) | 9 lines


  Reverting the patch from #3165, as it broke other
  behaviours. I left the original test commented out (note
  that that test came from #2702, which seems to have a
  problem in FreeBSD and Windows, but not in Linux).

  I included a new test, to watch over the now-broken
  behaviour, I took it from #3179.
........
  r64535 | georg.brandl | 2008-06-26 20:55:37 +0200 (Thu, 26 Jun 2008) | 2 lines

  Add a version tag for shutdown().
........
  r64554 | trent.nelson | 2008-06-27 04:24:49 +0200 (Fri, 27 Jun 2008) | 3 lines

  Initialized merge tracking via "svnmerge" with revisions "1-64347" from
  svn+ssh://pythondev@svn.python.org/python/branches/tnelson-trunk-bsddb-47-upgrade
........
  r64595 | facundo.batista | 2008-06-30 03:10:55 +0200 (Mon, 30 Jun 2008) | 3 lines


  Fix #2702, with a correct accounting of recursion.
........
  r64702 | georg.brandl | 2008-07-04 19:22:53 +0200 (Fri, 04 Jul 2008) | 2 lines

  Give the pickle special methods a signature.
........

........
  r64438 | raymond.hettinger | 2008-06-21 08:39:53 +0200 (Sat, 21 Jun 2008) | 1 line

  Issue 3008: hex/oct/bin can show floats exactly.
........
  r64439 | hyeshik.chang | 2008-06-21 13:15:30 +0200 (Sat, 21 Jun 2008) | 2 lines

  Fix build on FreeBSD gcc.
........
  r64516 | raymond.hettinger | 2008-06-25 00:46:07 +0200 (Wed, 25 Jun 2008) | 1 line

  Revert 64424, 64438, and 64439.
........

........
  r64424 | raymond.hettinger | 2008-06-20 06:18:15 +0200 (Fri, 20 Jun 2008) | 1 line

  Make bin() implementation parallel oct() and hex() so that int/long subclasses can override or so that other classes can support.
........

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

........
  r63997 | ronald.oussoren | 2008-06-06 23:31:33 +0200 (Fri, 06 Jun 2008) | 2 lines

  Fix build issue on OSX 10.4
........

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

........
  r63955 | ronald.oussoren | 2008-06-05 14:58:24 +0200 (Thu, 05 Jun 2008) | 20 lines

  MacOS X: Enable 4-way universal builds

  This patch adds a new configure argument on OSX:
          --with-universal-archs=[32-bit|64-bit|all]

  When used with the --enable-universalsdk option this controls which
  CPU architectures are includes in the framework. The default is 32-bit,
  meaning i386 and ppc. The most useful alternative is 'all', which includes
  all 4 CPU architectures supported by MacOS X (i386, ppc, x86_64 and ppc64).

  This includes limited support for the Carbon bindings in 64-bit mode as well,
  limited because (a) I haven't done extensive testing and (b) a large portion
  of the Carbon API's aren't available in 64-bit mode anyway.

  I've also duplicated a feature of Apple's build of python: setting the
  environment variable 'ARCHFLAGS' controls the '-arch' flags used for building
  extensions using distutils.
........

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

........
  r63828 | mark.hammond | 2008-05-31 07:11:07 +0200 (Sat, 31 May 2008) | 2 lines

  Fix bdist_wininst --user-access-control for win2k
........

........
  r64986 | benjamin.peterson | 2008-07-15 19:44:02 -0500 (Tue, 15 Jul 2008) | 1 line

  disable lib2to3 in the trunk. It's broken just for 2.6
........

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

........
  r64984 | eric.smith | 2008-07-15 20:11:49 -0400 (Tue, 15 Jul 2008) | 1 line

  Complete issue 3083: add alternate (#) formatting to bin, oct, hex in str.format().
........

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

........
  r64979 | thomas.heller | 2008-07-15 22:18:46 +0200 (Tue, 15 Jul 2008) | 1 line

  Fix test on 64-bit platforms.
........

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

........
  r64976 | thomas.heller | 2008-07-15 21:39:38 +0200 (Tue, 15 Jul 2008) | 3 lines

  Issue #3313: Contrary to the man page, a failed dlopen() call does not
  always set a dlerror() message.
........
  r64977 | thomas.heller | 2008-07-15 21:44:25 +0200 (Tue, 15 Jul 2008) | 2 lines

  Add Victor Stinner, he provided the patch for issue #3313.
........

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

........
  r64968 | thomas.heller | 2008-07-15 19:03:08 +0200 (Di, 15 Jul 2008) | 4 lines

  Issue #3258: Fix an assertion error (in debug build) and a crash (in
  release build) when the format string of a pointer to an incomplete
  structure is created.
........
  r64971 | thomas.heller | 2008-07-15 19:19:50 +0200 (Di, 15 Jul 2008) | 2 lines

  NEWS entry for #issue 3258.
........

Manual forward port of 64962 - use PyObject_HashNotImplemented as a tp_hash level indicator that the default hash implementation has not been inherited

patch from Antoine Pitrou #3112

........
  r64962 | nick.coghlan | 2008-07-16 00:27:37 +1000 (Wed, 16 Jul 2008) | 1 line

  Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
........

Added '#' formatting to integers.  This adds the 0b, 0o, or 0x prefix for bin, oct, hex.  There's still one failing case, and I need to finish the docs.  I hope to finish those today.

........
  r64958 | eric.smith | 2008-07-15 06:10:07 -0400 (Tue, 15 Jul 2008) | 1 line

  Added '#' formatting to integers.  This adds the 0b, 0o, or 0x prefix for bin, oct, hex.  There's still one failing case, and I need to finish the docs.  I hope to finish those today.
........

........
  r64953 | benjamin.peterson | 2008-07-14 12:42:17 -0500 (Mon, 14 Jul 2008) | 4 lines

  fix test_py3kwarns

  The fact that this was failing and went unnoticed so long seems like a good argument for being able to enable and disble py3kwarnings through Python.
........

All the u* gettext variants were renamed to their
none u* variants, since there's no point in translating
to byte strings. I also killed off the unicode parameters
for install

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

........
  r64842 | robert.schuppenies | 2008-07-10 15:43:26 +0200 (Thu, 10 Jul 2008) | 2 lines

  Fixed Issue3122 and extended sys.getsizeof tests for built-in types.
........
  r64853 | robert.schuppenies | 2008-07-10 17:24:04 +0200 (Thu, 10 Jul 2008) | 3 lines

  Added additional __sizeof__ implementations and addressed comments made in
  Issue3122.
........
  r64856 | robert.schuppenies | 2008-07-10 19:13:55 +0200 (Thu, 10 Jul 2008) | 3 lines

  Added garbage collector overhead and optional default return value to
  sys.getsizeof.
........
  r64945 | robert.schuppenies | 2008-07-14 10:42:18 +0200 (Mon, 14 Jul 2008) | 2 lines

  Fixed test failure on Win64 machines.
........

PyFunction_SetAnnotations().

........
  r64930 | alexandre.vassalotti | 2008-07-13 16:47:59 -0500 (Sun, 13 Jul 2008) | 3 lines

  Issue #3153: sqlite leaks on error.
  Changed statements of the form Py_DECREF(obj), obj = 0 to Py_CLEAR(obj).
........

Fix one more case in cursor.c.

........
  r64922 | benjamin.peterson | 2008-07-13 13:34:58 -0500 (Sun, 13 Jul 2008) | 1 line

  remove sys.version_info check for 3.0
........

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

........
  r64920 | benjamin.peterson | 2008-07-13 13:25:13 -0500 (Sun, 13 Jul 2008) | 1 line

  remove bytes alias
........

........
  r64913 | nick.coghlan | 2008-07-13 22:36:42 +1000 (Sun, 13 Jul 2008) | 1 line

  Correct a couple of errors in the updated catch_warning documentation (the Py3k version was fixed before being checked in)
........

........
  r64910 | nick.coghlan | 2008-07-13 22:23:47 +1000 (Sun, 13 Jul 2008) | 1 line

  Make test.test_support.catch_warnings more robust as discussed on python-dev. Also add explicit tests for itto test_warnings.
........

Make test.test_support.catch_warnings more robust as discussed on python-dev. Also add explicit tests for it to test_warnings. (forward port of r64910 from trunk)