Issue #25221: merge from 3.5.

This commit is contained in:
Mark Dickinson 2016-09-10 20:20:08 +01:00
commit 82cb124300
2 changed files with 5 additions and 1 deletions

View File

@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #25221: Fix corrupted result from PyLong_FromLong(0) when Python
is compiled with NSMALLPOSINTS = 0.
- Issue #27080: Implement formatting support for PEP 515. Initial patch - Issue #27080: Implement formatting support for PEP 515. Initial patch
by Chris Angelico. by Chris Angelico.

View File

@ -234,7 +234,7 @@ PyLong_FromLong(long ival)
unsigned long abs_ival; unsigned long abs_ival;
unsigned long t; /* unsigned so >> doesn't propagate sign bit */ unsigned long t; /* unsigned so >> doesn't propagate sign bit */
int ndigits = 0; int ndigits = 0;
int sign = 1; int sign;
CHECK_SMALL_INT(ival); CHECK_SMALL_INT(ival);
@ -246,6 +246,7 @@ PyLong_FromLong(long ival)
} }
else { else {
abs_ival = (unsigned long)ival; abs_ival = (unsigned long)ival;
sign = ival == 0 ? 0 : 1;
} }
/* Fast path for single-digit ints */ /* Fast path for single-digit ints */