Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge fix for issue #11450

This commit is contained in:
Antoine Pitrou 2011-03-09 12:47:20 +01:00
parent 2d12f96658 7983d33f54
commit 35db8a80c1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.2.1?
Core and Builtins 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 - 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). UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode).
Patch written by Ray Allen. Patch written by Ray Allen.

4
Modules/getbuildinfo.c
View File

@ -42,7 +42,9 @@
const char * const char *
Py_GetBuildInfo(void) 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 *revision = _Py_hgversion();
const char *sep = *revision ? ":" : ""; const char *sep = *revision ? ":" : "";
const char *hgid = _Py_hgidentifier(); const char *hgid = _Py_hgidentifier();