[Python-checkins] cpython (merge default -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/6badd5fcdc08
changeset:   73026:6badd5fcdc08
parent:      73025:5fa0cb61760d
parent:      73024:d383af9d62d2
user:        Raymond Hettinger <python at rcn.com>
date:        Thu Oct 20 09:43:12 2011 -0700
summary:
  merge

files:
  Misc/NEWS |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #12604: VTRACE macro expanded to no-op in _sre.c to avoid compiler
+  warnings. Patch by Josh Triplett and Petri Lehtinen.
+
 - Issue #12281: Rewrite the MBCS codec to handle correctly replace and ignore
   error handlers on all Windows versions. The MBCS codec is now supporting all
   error handlers, instead of only replace to encode and ignore to decode.
@@ -319,6 +322,9 @@
 Library
 -------
 
+- Issue #12529: fix cgi.parse_header issue on strings with double-quotes and
+  semicolons together. Patch by Ben Darnell and Petri Lehtinen.
+
 - Issue #13227: functools.lru_cache() now has a option to distinguish
   calls with different argument types.
 

-- 
Repository URL: http://hg.python.org/cpython