Merge fix for issue #11450

This commit is contained in:
Antoine Pitrou 2011-03-09 12:53:30 +01:00
commit d2dee34a85
2 changed files with 6 additions and 1 deletions

View File

@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 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 #11335: Fixed a memory leak in list.sort when the key function
throws an exception.

View File

@ -34,7 +34,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();