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

[benjamin.peterson]

http://hg.python.org/cpython/rev/c23b53882996
changeset:   68539:c23b53882996
parent:      68528:fbdcc7437b34
parent:      68538:68acbf72290c
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Mar 15 15:05:22 2011 -0500
summary:
  merge 3.2

files:
  Include/patchlevel.h
  Lib/test/test_subprocess.py

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -26,8 +26,9 @@
 #define PY_VERSION      	"3.3a0"
 /*--end constants--*/
 
-/* Subversion Revision number of this file (not of the repository) */
-#define PY_PATCHLEVEL_REVISION  "$Revision$"
+/* Subversion Revision number of this file (not of the repository). Empty
+   since Mercurial migration. */
+#define PY_PATCHLEVEL_REVISION  ""
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
    Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */

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