Reviewed by Martin von Loewis.

Blocked revisions 66386 via svnmerge (needs some fiddling to make it work in 3.0, will add a new patch to the tracker instead of merging)

........
  r66386 | nick.coghlan | 2008-09-11 22:11:06 +1000 (Thu, 11 Sep 2008) | 1 line

  Issue #3781: Final cleanup of warnings.catch_warnings and its usage in the test suite. Closes issue w.r.t. 2.6 (R: Brett Cannon)
........

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

........
  r66383 | martin.v.loewis | 2008-09-11 08:53:30 +0200 (Do, 11 Sep 2008) | 3 lines

  Issue #3642: Suppress warning in obmalloc when size_t is
  larger than uint. Reverts r65975. Reviewed by Brett Cannon.
........

Change the tests and use another code point.

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

........
  r66379 | benjamin.peterson | 2008-09-10 17:28:00 -0500 (Wed, 10 Sep 2008) | 1 line

  update asdl_c.py from r66377
........

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

........
  r66377 | amaury.forgeotdarc | 2008-09-11 00:04:45 +0200 (jeu., 11 sept. 2008) | 8 lines

  #3743: PY_FORMAT_SIZE_T is designed for the OS "printf" functions, not for
  PyString_FromFormat which has an independent implementation, and uses "%zd".

  This makes a difference on win64, where printf needs "%Id" to display
  64bit values. For example, queue.__repr__ was incorrect.

  Reviewed by Martin von Loewis.
........

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

........
  r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line

  Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
  r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines

  Fix varname in docstring. #3822.
........
  r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines

  #3472: update Mac-bundled Python version info.
........
  r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines

  Fix #3634 invalid return value from _weakref.ref(Exception).__init__

  Reviewers: Amaury, Antoine, Benjamin
........
  r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line

  use the latest pygments version
........

Reviewer: Antoine Pitrou #3827

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

........
  r66369 | martin.v.loewis | 2008-09-10 21:16:35 +0200 (Mi, 10 Sep 2008) | 4 lines

  Read unidata_version from unicodedata module.
  Delete old NormalizationTest.txt if it doesn't match
  unidata_version.
........

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

........
  r66367 | martin.v.loewis | 2008-09-10 20:43:49 +0200 (Mi, 10 Sep 2008) | 2 lines

  Update to test Unicode 5.1.
........

Patch by Andrew McNamara, reviewed and tweaked by myself.

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

........
  r66364 | guido.van.rossum | 2008-09-10 07:27:00 -0700 (Wed, 10 Sep 2008) | 3 lines

  Issue #3629: Fix sre "bytecode" validator for an end case.
  Reviewed by Amaury.
........

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

........
  r66362 | martin.v.loewis | 2008-09-10 15:38:12 +0200 (Mi, 10 Sep 2008) | 3 lines

  Issue #3811: The Unicode database was updated to 5.1.
  Reviewed by Fredrik Lundh and Marc-Andre Lemburg.
........

........
  r66181 | marc-andre.lemburg | 2008-09-03 06:13:56 -0500 (Wed, 03 Sep 2008) | 4 lines

  Issue #2562: Fix distutils PKG-INFO writing logic to allow having
  non-ascii characters and Unicode in setup.py meta-data.
........

Removed itertools usage from Lib/traceback.py, because itertools
is extension module, so maybe unavailable on build process.
(Lib/_dummy_thread.py uses Lib/traceback.py)

Reviewed by Amaury Forgeot d'Arc.

readlink(2) can return non-null-terminated string.
Reviewed by Amaury Forgeot d'Arc.

........
  r66316 | hirokazu.yamamoto | 2008-09-09 08:03:47 +0900 | 2 lines

  Issue #3804: Added test for Issue #2222.
  Reviewed by Benjamin Peterson.
........
  r66319 | hirokazu.yamamoto | 2008-09-09 08:38:42 +0900 | 2 lines

  Issue #3806: LockTests in test_imp should be skipped when thread is not available.
  Reviewed by Benjamin Peterson.
........

........
  r66332 | amaury.forgeotdarc | 2008-09-09 09:24:30 +0200 (mar., 09 sept. 2008) | 6 lines

  #3777: long(4.2) returned an int, and broke backward compatibility.
  the __long__ slot is allowed to return either int or long, but the behaviour of
  float objects should not change between 2.5 and 2.6.

  Reviewed by Benjamin Peterson
........

Reviewed by Benjamin Peterson.

Second part, for Windows.

Reviewed by Antoine Pitrou

And do not compile the core bsddb library.

Reviewed by Martin von Loewis.

the tests. Also fixed the warning message in cgi.py

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

........
  r66321 | brett.cannon | 2008-09-08 17:49:16 -0700 (Mon, 08 Sep 2008) | 7 lines

  warnings.catch_warnings() now returns a list or None instead of the custom
  WarningsRecorder object. This makes the API simpler to use as no special object
  must be learned.

  Closes issue 3781.
  Review by Benjamin Peterson.
........

Reviewed by Benjamin Peterson.

Merged revisions 66141,66145,66150,66180,66211,66217,66219,66226,66231,66244,66246,66249-66250,66264,66268,66272,66294,66306 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66141 | gregory.p.smith | 2008-09-02 00:29:51 -0500 (Tue, 02 Sep 2008) | 3 lines

  Issue #3678: Correctly pass LDFLAGS and LDLAST to the linker on shared
  library targets in the Makefile.
........
  r66145 | marc-andre.lemburg | 2008-09-02 05:32:34 -0500 (Tue, 02 Sep 2008) | 5 lines

  Add quotes around the file name to avoid issues with spaces.

  Closes #3719.
........
  r66150 | marc-andre.lemburg | 2008-09-02 07:11:19 -0500 (Tue, 02 Sep 2008) | 3 lines

  Add news item for #3719.
........
  r66180 | vinay.sajip | 2008-09-03 04:20:05 -0500 (Wed, 03 Sep 2008) | 1 line

  Issue #3726: Allowed spaces in separators in logging configuration files.
........
  r66211 | vinay.sajip | 2008-09-04 02:31:21 -0500 (Thu, 04 Sep 2008) | 1 line

  Issue #3772: Fixed regression problem in StreamHandler.emit().
........
  r66217 | andrew.kuchling | 2008-09-04 08:26:24 -0500 (Thu, 04 Sep 2008) | 1 line

  #3671: various corrections and markup fixes noted by Kent Johnson
........
  r66219 | hirokazu.yamamoto | 2008-09-04 09:25:30 -0500 (Thu, 04 Sep 2008) | 1 line

  Added NEWS
........
  r66226 | benjamin.peterson | 2008-09-04 18:31:27 -0500 (Thu, 04 Sep 2008) | 1 line

  flesh out the documentation on using 2to3
........
  r66231 | andrew.kuchling | 2008-09-05 10:15:56 -0500 (Fri, 05 Sep 2008) | 1 line

  #3671: Typo fix
........
  r66244 | jesse.noller | 2008-09-05 20:20:11 -0500 (Fri, 05 Sep 2008) | 2 lines

  Fix typo in multiprocessing doc, cancel_join_thread was missing _thread
........
  r66246 | benjamin.peterson | 2008-09-05 22:00:00 -0500 (Fri, 05 Sep 2008) | 1 line

  actually tell the name of the flag to use
........
  r66249 | andrew.kuchling | 2008-09-06 07:50:05 -0500 (Sat, 06 Sep 2008) | 1 line

  Various corrections
........
  r66250 | andrew.kuchling | 2008-09-06 08:04:02 -0500 (Sat, 06 Sep 2008) | 1 line

  #3040: include 'dest' argument in example; trim some trailing whitespace
........
  r66264 | benjamin.peterson | 2008-09-06 14:42:39 -0500 (Sat, 06 Sep 2008) | 1 line

  docs are pretty good about new-style classes these days
........
  r66268 | andrew.kuchling | 2008-09-06 15:28:01 -0500 (Sat, 06 Sep 2008) | 1 line

  #3669 from Robert Lehmann: simplify use of iterator in example
........
  r66272 | andrew.kuchling | 2008-09-06 16:26:02 -0500 (Sat, 06 Sep 2008) | 1 line

  #1317: describe the does_esmtp, ehlo_resp, esmtp_features, and helo_resp attributes
........
  r66294 | georg.brandl | 2008-09-07 12:00:17 -0500 (Sun, 07 Sep 2008) | 2 lines

  Add a new howto about Python and the web, by Marek Kubica.
........
  r66306 | mark.summerfield | 2008-09-08 09:45:37 -0500 (Mon, 08 Sep 2008) | 3 lines

  Added xrefs to each other.
........

........
  r66142 | gregory.p.smith | 2008-09-02 00:36:11 -0500 (Tue, 02 Sep 2008) | 3 lines

  Issue #3708: os.urandom no longer goes into an infinite loop when passed a
  non-integer floating point number.
........

........
  r66281 | josiah.carlson | 2008-09-06 22:53:58 -0500 (Sat, 06 Sep 2008) | 3 lines

  This fixes a small inconsistency between trunk and 3.0, closing bug 3764.
........
  r66282 | josiah.carlson | 2008-09-06 23:37:10 -0500 (Sat, 06 Sep 2008) | 3 lines

  undoing change that broke trunk.  Need to find a better solution to this.
........
  r66301 | facundo.batista | 2008-09-07 19:20:28 -0500 (Sun, 07 Sep 2008) | 4 lines


  Issue 3801.  Fixing a dumb error in the deprecated parse_qsl()
  function.  Tests added.
........
  r66310 | bill.janssen | 2008-09-08 11:37:24 -0500 (Mon, 08 Sep 2008) | 1 line

  incorporate fixes from issue 3162; SSL doc patch
........