Merge build identification to 3.2 branch.

diff --cc Include/pythonrun.h
index 86da6e0e29afd2b1210416fb4b6f36fc66571873,96a0e232f9dadbb96a707da0990a3179bd1fc495..bbcae73d2182574a557ad2e77a5da48dfa9f82ad
--- 1/Include/pythonrun.h
--- 2/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@@ -182,10 -120,10 +182,12 @@@ PyAPI_FUNC(const char *) Py_GetBuildInf
  PyAPI_FUNC(const char *) _Py_svnversion(void);
  PyAPI_FUNC(const char *) Py_SubversionRevision(void);
  PyAPI_FUNC(const char *) Py_SubversionShortBranch(void);
+ PyAPI_FUNC(const char *) _Py_hgidentifier(void);
+ PyAPI_FUNC(const char *) _Py_hgversion(void);
 +#endif
  
  /* Internal -- various one-time initializations */
 +#ifndef Py_LIMITED_API
  PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void);
  PyAPI_FUNC(PyObject *) _PySys_Init(void);
  PyAPI_FUNC(void) _PyImport_Init(void);

diff --cc Lib/platform.py
Simple merge

diff --cc Lib/test/test_platform.py
Simple merge

diff --cc Makefile.pre.in
index 24d364dd5cd5bd11fc6148d6dc0d78ec735688d4,211a70354f7a5877bbea2d3eb41abf9376abdd42..d665939c7517e4215b7497a38e6f66828f189a1b
--- 1/Makefile.pre.in
--- 2/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -35,8 -35,9 +35,11 @@@ LINKCC=              @LINKCC
  AR=           @AR@
  RANLIB=               @RANLIB@
  SVNVERSION=   @SVNVERSION@
 +SOABI=                @SOABI@
 +LDVERSION=    @LDVERSION@
+ HGVERSION=    @HGVERSION@
+ HGTAG=                @HGTAG@
+ HGBRANCH=     @HGBRANCH@
  
  GNULD=                @GNULD@
  
@@@ -552,10 -528,15 +555,15 @@@ Modules/getbuildinfo.o: $(PARSER_OBJS) 
                $(SIGNAL_OBJS) \
                $(MODOBJS) \
                $(srcdir)/Modules/getbuildinfo.c
-       $(CC) -c $(PY_CORE_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
 -      $(CC) -c $(PY_CFLAGS) \
++      $(CC) -c $(PY_CORE_CFLAGS) \
+             -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \
+             -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
+             -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
+             -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
+             -o $@ $(srcdir)/Modules/getbuildinfo.c
  
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
 -      $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
 +      $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
                -DPREFIX='"$(prefix)"' \
                -DEXEC_PREFIX='"$(exec_prefix)"' \
                -DVERSION='"$(VERSION)"' \

diff --cc Python/sysmodule.c
index de51155a49a4d593a8fb62df05be43a93258e09e,f85cc55ad1d8074e0f1b2eda6e3904c1baef2f43..ea095d26607a66922e0c6f580253721ff40f504c
--- 1/Python/sysmodule.c
--- 2/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@@ -1598,8 -1356,11 +1598,11 @@@ _PySys_Init(void
                           PyLong_FromLong(PY_VERSION_HEX));
      svnversion_init();
      SET_SYS_FROM_STRING("subversion",
 -                        Py_BuildValue("(UUU)", "CPython", branch,
 +                        Py_BuildValue("(sss)", "CPython", branch,
                                        svn_revision));
+     SET_SYS_FROM_STRING("_mercurial",
+                         Py_BuildValue("(szz)", "CPython", _Py_hgidentifier(),
+                                       _Py_hgversion()));
      SET_SYS_FROM_STRING("dont_write_bytecode",
                           PyBool_FromLong(Py_DontWriteBytecodeFlag));
      SET_SYS_FROM_STRING("api_version",

diff --cc configure
index 96747ff784f2ebf92d7ac0c75dc147c1f8c6ca6b,1ef57d06bc7e3bbbf3088234bac5078d882a999d..98ae6e651dfdc46715acb76e7041d3b793e244bb
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
- # From configure.in Revision: 88430 .
+ # From configure.in Revision.
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.68 for python 3.1.
 +# Generated by GNU Autoconf 2.68 for python 3.2.
  #
  # Report bugs to <http://bugs.python.org/>.
  #

diff --cc configure.in
Simple merge