mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Fix for SF bug #415514: "%#x" % 0 caused assertion failure/abort.
http://sourceforge.net/tracker/index.php?func=detail&aid=415514&group_id=5470&atid=105470 For short ints, Python defers to the platform C library to figure out what %#x should do. The code asserted that the platform C returned a string beginning with "0x". However, that's not true when-- and only when --the *value* being formatted is 0. Changed the code to live with C's inconsistency here. In the meantime, the problem does not arise if you format a long 0 (0L) instead. However, that's because the code *we* wrote to do %#x conversions on longs produces a leading "0x" regardless of value. That's probably wrong too: we should drop leading "0x", for consistency with C, when (& only when) formatting 0L. So I changed the long formatting code to do that too.
This commit is contained in:
parent
4642cb9ac9
commit
711088d9b8
3 changed files with 53 additions and 25 deletions
|
@ -164,6 +164,22 @@ testboth("%d", 42, "42")
|
|||
testboth("%d", -42, "-42")
|
||||
testboth("%d", 42L, "42")
|
||||
testboth("%d", -42L, "-42")
|
||||
testboth("%#x", 1, "0x1")
|
||||
testboth("%#x", 1L, "0x1")
|
||||
testboth("%#X", 1, "0X1")
|
||||
testboth("%#X", 1L, "0X1")
|
||||
testboth("%#o", 1, "01")
|
||||
testboth("%#o", 1L, "01")
|
||||
testboth("%#o", 0, "0")
|
||||
testboth("%#o", 0L, "0")
|
||||
testboth("%o", 0, "0")
|
||||
testboth("%o", 0L, "0")
|
||||
testboth("%d", 0, "0")
|
||||
testboth("%d", 0L, "0")
|
||||
testboth("%#x", 0, "0")
|
||||
testboth("%#x", 0L, "0")
|
||||
testboth("%#X", 0, "0")
|
||||
testboth("%#X", 0L, "0")
|
||||
|
||||
testboth("%x", 0x42, "42")
|
||||
# testboth("%x", -0x42, "ffffffbe") # Alas, that's specific to 32-bit machines
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue