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

Issue #29000: Fixed bytes formatting of octals with zero padding in alternate 

form.
This commit is contained in:
Serhiy Storchaka 2016-12-17 21:48:03 +02:00
parent af56e0e70f
commit b1a1619bf0
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Lib/test/test_format.py
View File

@ -114,6 +114,7 @@ class FormatTest(unittest.TestCase):
testcommon("%o", 100000000000, "1351035564000") testcommon("%o", 100000000000, "1351035564000")
testcommon("%d", 10, "10") testcommon("%d", 10, "10")
testcommon("%d", 100000000000, "100000000000") testcommon("%d", 100000000000, "100000000000")
big = 123456789012345678901234567890 big = 123456789012345678901234567890
testcommon("%d", big, "123456789012345678901234567890") testcommon("%d", big, "123456789012345678901234567890")
testcommon("%d", -big, "-123456789012345678901234567890") testcommon("%d", -big, "-123456789012345678901234567890")
@ -133,6 +134,7 @@ class FormatTest(unittest.TestCase):
testcommon("%.31d", big, "0123456789012345678901234567890") testcommon("%.31d", big, "0123456789012345678901234567890")
testcommon("%32.31d", big, " 0123456789012345678901234567890") testcommon("%32.31d", big, " 0123456789012345678901234567890")
testcommon("%d", float(big), "123456________________________", 6) testcommon("%d", float(big), "123456________________________", 6)
big = 0x1234567890abcdef12345 # 21 hex digits big = 0x1234567890abcdef12345 # 21 hex digits
testcommon("%x", big, "1234567890abcdef12345") testcommon("%x", big, "1234567890abcdef12345")
testcommon("%x", -big, "-1234567890abcdef12345") testcommon("%x", -big, "-1234567890abcdef12345")
@ -156,19 +158,26 @@ class FormatTest(unittest.TestCase):
testcommon("%#X", big, "0X1234567890ABCDEF12345") testcommon("%#X", big, "0X1234567890ABCDEF12345")
testcommon("%#x", big, "0x1234567890abcdef12345") testcommon("%#x", big, "0x1234567890abcdef12345")
testcommon("%#x", -big, "-0x1234567890abcdef12345") testcommon("%#x", -big, "-0x1234567890abcdef12345")
testcommon("%#27x", big, " 0x1234567890abcdef12345")
testcommon("%#-27x", big, "0x1234567890abcdef12345 ")
testcommon("%#027x", big, "0x00001234567890abcdef12345")
testcommon("%#.23x", big, "0x001234567890abcdef12345")
testcommon("%#.23x", -big, "-0x001234567890abcdef12345") testcommon("%#.23x", -big, "-0x001234567890abcdef12345")
testcommon("%#27.23x", big, " 0x001234567890abcdef12345")
testcommon("%#-27.23x", big, "0x001234567890abcdef12345 ")
testcommon("%#027.23x", big, "0x00001234567890abcdef12345")
testcommon("%#+.23x", big, "+0x001234567890abcdef12345") testcommon("%#+.23x", big, "+0x001234567890abcdef12345")
testcommon("%# .23x", big, " 0x001234567890abcdef12345") testcommon("%# .23x", big, " 0x001234567890abcdef12345")
testcommon("%#+.23X", big, "+0X001234567890ABCDEF12345") testcommon("%#+.23X", big, "+0X001234567890ABCDEF12345")
testcommon("%#-+.23X", big, "+0X001234567890ABCDEF12345")
testcommon("%#-+26.23X", big, "+0X001234567890ABCDEF12345")
testcommon("%#-+27.23X", big, "+0X001234567890ABCDEF12345 ")
testcommon("%#+27.23X", big, " +0X001234567890ABCDEF12345")
# next one gets two leading zeroes from precision, and another from the # next one gets two leading zeroes from precision, and another from the
# 0 flag and the width # 0 flag and the width
testcommon("%#+027.23X", big, "+0X0001234567890ABCDEF12345") testcommon("%#+027.23X", big, "+0X0001234567890ABCDEF12345")
testcommon("%# 027.23X", big, " 0X0001234567890ABCDEF12345")
# same, except no 0 flag # same, except no 0 flag
testcommon("%#+27.23X", big, " +0X001234567890ABCDEF12345") testcommon("%#+27.23X", big, " +0X001234567890ABCDEF12345")
testcommon("%#-+27.23x", big, "+0x001234567890abcdef12345 ")
testcommon("%#- 27.23x", big, " 0x001234567890abcdef12345 ")
big = 0o12345670123456701234567012345670 # 32 octal digits big = 0o12345670123456701234567012345670 # 32 octal digits
testcommon("%o", big, "12345670123456701234567012345670") testcommon("%o", big, "12345670123456701234567012345670")
testcommon("%o", -big, "-12345670123456701234567012345670") testcommon("%o", -big, "-12345670123456701234567012345670")
@ -191,13 +200,21 @@ class FormatTest(unittest.TestCase):
testcommon("%o", big, "12345670123456701234567012345670") testcommon("%o", big, "12345670123456701234567012345670")
testcommon("%#o", big, "0o12345670123456701234567012345670") testcommon("%#o", big, "0o12345670123456701234567012345670")
testcommon("%#o", -big, "-0o12345670123456701234567012345670") testcommon("%#o", -big, "-0o12345670123456701234567012345670")
testcommon("%#38o", big, " 0o12345670123456701234567012345670")
testcommon("%#-38o", big, "0o12345670123456701234567012345670 ")
testcommon("%#038o", big, "0o000012345670123456701234567012345670")
testcommon("%#.34o", big, "0o0012345670123456701234567012345670")
testcommon("%#.34o", -big, "-0o0012345670123456701234567012345670") testcommon("%#.34o", -big, "-0o0012345670123456701234567012345670")
testcommon("%#38.34o", big, " 0o0012345670123456701234567012345670")
testcommon("%#-38.34o", big, "0o0012345670123456701234567012345670 ")
testcommon("%#038.34o", big, "0o000012345670123456701234567012345670")
testcommon("%#+.34o", big, "+0o0012345670123456701234567012345670") testcommon("%#+.34o", big, "+0o0012345670123456701234567012345670")
testcommon("%# .34o", big, " 0o0012345670123456701234567012345670") testcommon("%# .34o", big, " 0o0012345670123456701234567012345670")
testcommon("%#+.34o", big, "+0o0012345670123456701234567012345670") testcommon("%#+38.34o", big, " +0o0012345670123456701234567012345670")
testcommon("%#-+.34o", big, "+0o0012345670123456701234567012345670") testcommon("%#-+38.34o", big, "+0o0012345670123456701234567012345670 ")
testcommon("%#-+37.34o", big, "+0o0012345670123456701234567012345670") testcommon("%#- 38.34o", big, " 0o0012345670123456701234567012345670 ")
testcommon("%#+37.34o", big, "+0o0012345670123456701234567012345670") testcommon("%#+038.34o", big, "+0o00012345670123456701234567012345670")
testcommon("%# 038.34o", big, " 0o00012345670123456701234567012345670")
# next one gets one leading zero from precision # next one gets one leading zero from precision
testcommon("%.33o", big, "012345670123456701234567012345670") testcommon("%.33o", big, "012345670123456701234567012345670")
# base marker added in spite of leading zero (different to Python 2) # base marker added in spite of leading zero (different to Python 2)
@ -208,6 +225,7 @@ class FormatTest(unittest.TestCase):
testcommon("%035.33o", big, "00012345670123456701234567012345670") testcommon("%035.33o", big, "00012345670123456701234567012345670")
# base marker shouldn't change the size # base marker shouldn't change the size
testcommon("%0#35.33o", big, "0o012345670123456701234567012345670") testcommon("%0#35.33o", big, "0o012345670123456701234567012345670")
# Some small ints, in both Python int and flavors). # Some small ints, in both Python int and flavors).
testcommon("%d", 42, "42") testcommon("%d", 42, "42")
testcommon("%d", -42, "-42") testcommon("%d", -42, "-42")

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ Release date: TBA
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #29000: Fixed bytes formatting of octals with zero padding in alternate
form.
- Issue #28512: Fixed setting the offset attribute of SyntaxError by - Issue #28512: Fixed setting the offset attribute of SyntaxError by
PyErr_SyntaxLocationEx() and PyErr_SyntaxLocationObject(). PyErr_SyntaxLocationEx() and PyErr_SyntaxLocationObject().

5
Objects/bytesobject.c
View File

@ -882,7 +882,7 @@ _PyBytes_Format(PyObject *format, PyObject *args)
if (width > len) if (width > len)
width--; width--;
} }
if ((flags & F_ALT) && (c == 'x' || c == 'X')) { if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) {
assert(pbuf[0] == '0'); assert(pbuf[0] == '0');
assert(pbuf[1] == c); assert(pbuf[1] == c);
if (fill != ' ') { if (fill != ' ') {
@ -904,8 +904,7 @@ _PyBytes_Format(PyObject *format, PyObject *args)
if (fill == ' ') { if (fill == ' ') {
if (sign) if (sign)
*res++ = sign; *res++ = sign;
if ((flags & F_ALT) && if ((flags & F_ALT) && (c == 'o' || c == 'x' || c == 'X')) {
(c == 'x' || c == 'X')) {
assert(pbuf[0] == '0'); assert(pbuf[0] == '0');
assert(pbuf[1] == c); assert(pbuf[1] == c);
*res++ = *pbuf++; *res++ = *pbuf++;