Merge fix for issue #11450

This commit is contained in:
Antoine Pitrou 2011-03-09 12:47:20 +01:00
commit 35db8a80c1
2 changed files with 6 additions and 1 deletions

View File

@ -10,6 +10,9 @@ What's New in Python 3.2.1?
Core and Builtins
-----------------
- Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
there are many tags (e.g. when using mq). Patch by Nadeem Vawda.
- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from
UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode).
Patch written by Ray Allen.

View File

@ -42,7 +42,9 @@
const char *
Py_GetBuildInfo(void)
{
static char buildinfo[50];
static char buildinfo[50 + sizeof HGVERSION +
((sizeof HGTAG > sizeof HGBRANCH) ?
sizeof HGTAG : sizeof HGBRANCH)];
const char *revision = _Py_hgversion();
const char *sep = *revision ? ":" : "";
const char *hgid = _Py_hgidentifier();