Forward port of r64958.
Added '#' formatting to integers. This adds the 0b, 0o, or 0x prefix for bin, oct, hex. There's still one failing case, and I need to finish the docs. I hope to finish those today.
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index d7deea0..360cfe4 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -293,6 +293,40 @@
test(1234, "+b", "+10011010010")
test(-1234, "+b", "-10011010010")
+ # alternate (#) formatting
+ test(0, "#b", '0b0')
+ test(0, "-#b", '0b0')
+ test(1, "-#b", '0b1')
+ test(-1, "-#b", '-0b1')
+ test(-1, "-#5b", ' -0b1')
+ test(1, "+#5b", ' +0b1')
+ test(100, "+#b", '+0b1100100')
+# test(100, "#012b", '0b001100100')
+
+ test(0, "#o", '0o0')
+ test(0, "-#o", '0o0')
+ test(1, "-#o", '0o1')
+ test(-1, "-#o", '-0o1')
+ test(-1, "-#5o", ' -0o1')
+ test(1, "+#5o", ' +0o1')
+ test(100, "+#o", '+0o144')
+
+ test(0, "#x", '0x0')
+ test(0, "-#x", '0x0')
+ test(1, "-#x", '0x1')
+ test(-1, "-#x", '-0x1')
+ test(-1, "-#5x", ' -0x1')
+ test(1, "+#5x", ' +0x1')
+ test(100, "+#x", '+0x64')
+
+ test(0, "#X", '0X0')
+ test(0, "-#X", '0X0')
+ test(1, "-#X", '0X1')
+ test(-1, "-#X", '-0X1')
+ test(-1, "-#5X", ' -0X1')
+ test(1, "+#5X", ' +0X1')
+ test(100, "+#X", '+0X64')
+
# make sure these are errors
# precision disallowed
@@ -509,6 +543,10 @@
self.assertRaises(ValueError, format, 1e-100, format_spec)
self.assertRaises(ValueError, format, -1e-100, format_spec)
+ # Alternate formatting is not supported
+ self.assertRaises(ValueError, format, 0.0, '#')
+ self.assertRaises(ValueError, format, 0.0, '#20f')
+
def test_main():
run_unittest(TypesTests)