Skip to content

C
cpython
Commit 6ef4f16c authored by Mark Dickinson's avatar Mark Dickinson
Browse files
Options

Fix doctests in test_tokenize by converting Python 2.x syntax 

to Python 3.0 syntax (drop leading '0' and trailing 'L' from
integer literals, remove leading 'u' from unicode string
literals), and adjusting expected output accordingly.
parent 990bf05b
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
Lib/test/test_tokenize.py
View file @ 6ef4f16c
...@@ -125,16 +125,16 @@ Ordinary integers and binary operators ...@@ -125,16 +125,16 @@ Ordinary integers and binary operators
NUMBER '0xff' (1, 0) (1, 4) NUMBER '0xff' (1, 0) (1, 4)
OP '<=' (1, 5) (1, 7) OP '<=' (1, 5) (1, 7)
NUMBER '255' (1, 8) (1, 11) NUMBER '255' (1, 8) (1, 11)
>>> dump_tokens("01234567 > ~0x15") >>> dump_tokens("1234567 > ~0x15")
NUMBER '01234567' (1, 0) (1, 8) NUMBER '1234567' (1, 0) (1, 7)
OP '>' (1, 9) (1, 10) OP '>' (1, 8) (1, 9)
OP '~' (1, 11) (1, 12) OP '~' (1, 10) (1, 11)
NUMBER '0x15' (1, 12) (1, 16) NUMBER '0x15' (1, 11) (1, 15)
>>> dump_tokens("2134568 != 01231515") >>> dump_tokens("2134568 != 1231515")
NUMBER '2134568' (1, 0) (1, 7) NUMBER '2134568' (1, 0) (1, 7)
OP '!=' (1, 8) (1, 10) OP '!=' (1, 8) (1, 10)
NUMBER '01231515' (1, 11) (1, 19) NUMBER '1231515' (1, 11) (1, 18)
>>> dump_tokens("(-124561-1) & 0200000000") >>> dump_tokens("(-124561-1) & 200000000")
OP '(' (1, 0) (1, 1) OP '(' (1, 0) (1, 1)
OP '-' (1, 1) (1, 2) OP '-' (1, 1) (1, 2)
NUMBER '124561' (1, 2) (1, 8) NUMBER '124561' (1, 2) (1, 8)
...@@ -142,16 +142,16 @@ Ordinary integers and binary operators ...@@ -142,16 +142,16 @@ Ordinary integers and binary operators
NUMBER '1' (1, 9) (1, 10) NUMBER '1' (1, 9) (1, 10)
OP ')' (1, 10) (1, 11) OP ')' (1, 10) (1, 11)
OP '&' (1, 12) (1, 13) OP '&' (1, 12) (1, 13)
NUMBER '0200000000' (1, 14) (1, 24) NUMBER '200000000' (1, 14) (1, 23)
>>> dump_tokens("0xdeadbeef != -1") >>> dump_tokens("0xdeadbeef != -1")
NUMBER '0xdeadbeef' (1, 0) (1, 10) NUMBER '0xdeadbeef' (1, 0) (1, 10)
OP '!=' (1, 11) (1, 13) OP '!=' (1, 11) (1, 13)
OP '-' (1, 14) (1, 15) OP '-' (1, 14) (1, 15)
NUMBER '1' (1, 15) (1, 16) NUMBER '1' (1, 15) (1, 16)
>>> dump_tokens("0xdeadc0de & 012345") >>> dump_tokens("0xdeadc0de & 12345")
NUMBER '0xdeadc0de' (1, 0) (1, 10) NUMBER '0xdeadc0de' (1, 0) (1, 10)
OP '&' (1, 11) (1, 12) OP '&' (1, 11) (1, 12)
NUMBER '012345' (1, 13) (1, 19) NUMBER '12345' (1, 13) (1, 18)
>>> dump_tokens("0xFF & 0x15 | 1234") >>> dump_tokens("0xFF & 0x15 | 1234")
NUMBER '0xFF' (1, 0) (1, 4) NUMBER '0xFF' (1, 0) (1, 4)
OP '&' (1, 5) (1, 6) OP '&' (1, 5) (1, 6)
...@@ -161,23 +161,23 @@ Ordinary integers and binary operators ...@@ -161,23 +161,23 @@ Ordinary integers and binary operators
Long integers Long integers
>>> dump_tokens("x = 0L") >>> dump_tokens("x = 0")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
NUMBER '0L' (1, 4) (1, 6) NUMBER '0' (1, 4) (1, 5)
>>> dump_tokens("x = 0xfffffffffff") >>> dump_tokens("x = 0xfffffffffff")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
NUMBER '0xffffffffff (1, 4) (1, 17) NUMBER '0xffffffffff (1, 4) (1, 17)
>>> dump_tokens("x = 123141242151251616110l") >>> dump_tokens("x = 123141242151251616110")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
NUMBER '123141242151 (1, 4) (1, 26) NUMBER '123141242151 (1, 4) (1, 25)
>>> dump_tokens("x = -15921590215012591L") >>> dump_tokens("x = -15921590215012591")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
OP '-' (1, 4) (1, 5) OP '-' (1, 4) (1, 5)
NUMBER '159215902150 (1, 5) (1, 23) NUMBER '159215902150 (1, 5) (1, 22)
Floating point numbers Floating point numbers
...@@ -236,38 +236,38 @@ String literals ...@@ -236,38 +236,38 @@ String literals
STRING '"doesn\\'t "' (1, 4) (1, 14) STRING '"doesn\\'t "' (1, 4) (1, 14)
NAME 'shrink' (1, 14) (1, 20) NAME 'shrink' (1, 14) (1, 20)
STRING '", does it"' (1, 20) (1, 31) STRING '", does it"' (1, 20) (1, 31)
>>> dump_tokens("x = u'abc' + U'ABC'") >>> dump_tokens("x = 'abc' + 'ABC'")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
STRING "u'abc'" (1, 4) (1, 10) STRING "'abc'" (1, 4) (1, 9)
OP '+' (1, 11) (1, 12) OP '+' (1, 10) (1, 11)
STRING "U'ABC'" (1, 13) (1, 19) STRING "'ABC'" (1, 12) (1, 17)
>>> dump_tokens('y = "ABC" + "ABC"') >>> dump_tokens('y = "ABC" + "ABC"')
NAME 'y' (1, 0) (1, 1) NAME 'y' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
STRING '"ABC"' (1, 4) (1, 10) STRING '"ABC"' (1, 4) (1, 9)
OP '+' (1, 11) (1, 12) OP '+' (1, 10) (1, 11)
STRING '"ABC"' (1, 13) (1, 19) STRING '"ABC"' (1, 12) (1, 17)
>>> dump_tokens("x = r'abc' + r'ABC' + R'ABC' + R'ABC'") >>> dump_tokens("x = r'abc' + r'ABC' + R'ABC' + R'ABC'")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
STRING "r'abc'" (1, 4) (1, 11) STRING "r'abc'" (1, 4) (1, 10)
OP '+' (1, 12) (1, 13) OP '+' (1, 11) (1, 12)
STRING "r'ABC'" (1, 14) (1, 21) STRING "r'ABC'" (1, 13) (1, 19)
OP '+' (1, 22) (1, 23) OP '+' (1, 20) (1, 21)
STRING "R'ABC'" (1, 24) (1, 31) STRING "R'ABC'" (1, 22) (1, 28)
OP '+' (1, 32) (1, 33) OP '+' (1, 29) (1, 30)
STRING "R'ABC'" (1, 34) (1, 41) STRING "R'ABC'" (1, 31) (1, 37)
>>> dump_tokens('y = r"abc" + r"ABC" + R"ABC" + R"ABC"') >>> dump_tokens('y = r"abc" + r"ABC" + R"ABC" + R"ABC"')
NAME 'y' (1, 0) (1, 1) NAME 'y' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
STRING 'r"abc"' (1, 4) (1, 11) STRING 'r"abc"' (1, 4) (1, 10)
OP '+' (1, 12) (1, 13) OP '+' (1, 11) (1, 12)
STRING 'r"ABC"' (1, 14) (1, 21) STRING 'r"ABC"' (1, 13) (1, 19)
OP '+' (1, 22) (1, 23) OP '+' (1, 20) (1, 21)
STRING 'R"ABC"' (1, 24) (1, 31) STRING 'R"ABC"' (1, 22) (1, 28)
OP '+' (1, 32) (1, 33) OP '+' (1, 29) (1, 30)
STRING 'R"ABC"' (1, 34) (1, 41) STRING 'R"ABC"' (1, 31) (1, 37)
Operators Operators
...@@ -359,7 +359,7 @@ Shift ...@@ -359,7 +359,7 @@ Shift
Additive Additive
>>> dump_tokens("x = 1 - y + 15 - 01 + 0x124 + z + a[5]") >>> dump_tokens("x = 1 - y + 15 - 1 + 0x124 + z + a[5]")
NAME 'x' (1, 0) (1, 1) NAME 'x' (1, 0) (1, 1)
OP '=' (1, 2) (1, 3) OP '=' (1, 2) (1, 3)
NUMBER '1' (1, 4) (1, 5) NUMBER '1' (1, 4) (1, 5)
...@@ -368,16 +368,16 @@ Additive ...@@ -368,16 +368,16 @@ Additive
OP '+' (1, 10) (1, 11) OP '+' (1, 10) (1, 11)
NUMBER '15' (1, 12) (1, 14) NUMBER '15' (1, 12) (1, 14)
OP '-' (1, 15) (1, 16) OP '-' (1, 15) (1, 16)
NUMBER '01' (1, 17) (1, 19) NUMBER '1' (1, 17) (1, 18)
OP '+' (1, 20) (1, 21) OP '+' (1, 19) (1, 20)
NUMBER '0x124' (1, 22) (1, 27) NUMBER '0x124' (1, 21) (1, 26)
OP '+' (1, 28) (1, 29) OP '+' (1, 27) (1, 28)
NAME 'z' (1, 30) (1, 31) NAME 'z' (1, 29) (1, 30)
OP '+' (1, 32) (1, 33) OP '+' (1, 31) (1, 32)
NAME 'a' (1, 34) (1, 35) NAME 'a' (1, 33) (1, 34)
OP '[' (1, 35) (1, 36) OP '[' (1, 34) (1, 35)
NUMBER '5' (1, 36) (1, 37) NUMBER '5' (1, 35) (1, 36)
OP ']' (1, 37) (1, 38) OP ']' (1, 36) (1, 37)
Multiplicative Multiplicative
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7