diff options
| author | Larry Hastings <larry@hastings.org> | 2014-01-06 15:24:19 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-01-06 15:24:19 (GMT) |
| commit | b7f5dcadf2a929a92cfd5d0386426bc143cb01b4 (patch) | |
| tree | d3ee3564eac5ff32bf9db2f90907f1979969918b /Lib/test/test_format.py | |
| parent | e7ee44e9ba36fe6220ebb31c5c7faad5cfb2a250 (diff) | |
| parent | 74fc8c47f66da5673ed733d21e9014e9508f2819 (diff) | |
| download | cpython-b7f5dcadf2a929a92cfd5d0386426bc143cb01b4.zip cpython-b7f5dcadf2a929a92cfd5d0386426bc143cb01b4.tar.gz cpython-b7f5dcadf2a929a92cfd5d0386426bc143cb01b4.tar.bz2 | |
Merge 3.4.0b2 release revisions back into mainline.
Diffstat (limited to 'Lib/test/test_format.py')
| -rw-r--r-- | Lib/test/test_format.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py index 29330f9..4b1fdf9 100644 --- a/Lib/test/test_format.py +++ b/Lib/test/test_format.py @@ -142,7 +142,6 @@ class FormatTest(unittest.TestCase): testformat("%#+027.23X", big, "+0X0001234567890ABCDEF12345") # same, except no 0 flag testformat("%#+27.23X", big, " +0X001234567890ABCDEF12345") - testformat("%x", float(big), "123456_______________", 6) big = 0o12345670123456701234567012345670 # 32 octal digits testformat("%o", big, "12345670123456701234567012345670") testformat("%o", -big, "-12345670123456701234567012345670") @@ -182,7 +181,6 @@ class FormatTest(unittest.TestCase): testformat("%034.33o", big, "0012345670123456701234567012345670") # base marker shouldn't change that testformat("%0#34.33o", big, "0o012345670123456701234567012345670") - testformat("%o", float(big), "123456__________________________", 6) # Some small ints, in both Python int and flavors). testformat("%d", 42, "42") testformat("%d", -42, "-42") @@ -193,7 +191,6 @@ class FormatTest(unittest.TestCase): testformat("%#x", 1, "0x1") testformat("%#X", 1, "0X1") testformat("%#X", 1, "0X1") - testformat("%#x", 1.0, "0x1") testformat("%#o", 1, "0o1") testformat("%#o", 1, "0o1") testformat("%#o", 0, "0o0") @@ -210,12 +207,10 @@ class FormatTest(unittest.TestCase): testformat("%x", -0x42, "-42") testformat("%x", 0x42, "42") testformat("%x", -0x42, "-42") - testformat("%x", float(0x42), "42") testformat("%o", 0o42, "42") testformat("%o", -0o42, "-42") testformat("%o", 0o42, "42") testformat("%o", -0o42, "-42") - testformat("%o", float(0o42), "42") testformat("%r", "\u0378", "'\\u0378'") # non printable testformat("%a", "\u0378", "'\\u0378'") # non printable testformat("%r", "\u0374", "'\u0374'") # printable |