Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0c1f7c0

Browse files
mdickinsonmdickinson
committed
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.
1 parent fc689dd commit 0c1f7c0

1 file changed

Lines changed: 49 additions & 49 deletions

File tree

‎Lib/test/test_tokenize.py‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -125,33 +125,33 @@
125125
NUMBER '0xff' (1, 0) (1, 4)
126126
OP '<=' (1, 5) (1, 7)
127127
NUMBER '255' (1, 8) (1, 11)
128-
>>> dump_tokens("01234567 > ~0x15")
129-
NUMBER '01234567' (1, 0) (1, 8)
130-
OP '>' (1, 9) (1, 10)
131-
OP '~' (1, 11) (1, 12)
132-
NUMBER '0x15' (1, 12) (1, 16)
133-
>>> dump_tokens("2134568 != 01231515")
128+
>>> dump_tokens("1234567 > ~0x15")
129+
NUMBER '1234567' (1, 0) (1, 7)
130+
OP '>' (1, 8) (1, 9)
131+
OP '~' (1, 10) (1, 11)
132+
NUMBER '0x15' (1, 11) (1, 15)
133+
>>> dump_tokens("2134568 != 1231515")
134134
NUMBER '2134568' (1, 0) (1, 7)
135135
OP '!=' (1, 8) (1, 10)
136-
NUMBER '01231515' (1, 11) (1, 19)
137-
>>> dump_tokens("(-124561-1) & 0200000000")
136+
NUMBER '1231515' (1, 11) (1, 18)
137+
>>> dump_tokens("(-124561-1) & 200000000")
138138
OP '(' (1, 0) (1, 1)
139139
OP '-' (1, 1) (1, 2)
140140
NUMBER '124561' (1, 2) (1, 8)
141141
OP '-' (1, 8) (1, 9)
142142
NUMBER '1' (1, 9) (1, 10)
143143
OP ')' (1, 10) (1, 11)
144144
OP '&' (1, 12) (1, 13)
145-
NUMBER '0200000000' (1, 14) (1, 24)
145+
NUMBER '200000000' (1, 14) (1, 23)
146146
>>> dump_tokens("0xdeadbeef != -1")
147147
NUMBER '0xdeadbeef' (1, 0) (1, 10)
148148
OP '!=' (1, 11) (1, 13)
149149
OP '-' (1, 14) (1, 15)
150150
NUMBER '1' (1, 15) (1, 16)
151-
>>> dump_tokens("0xdeadc0de & 012345")
151+
>>> dump_tokens("0xdeadc0de & 12345")
152152
NUMBER '0xdeadc0de' (1, 0) (1, 10)
153153
OP '&' (1, 11) (1, 12)
154-
NUMBER '012345' (1, 13) (1, 19)
154+
NUMBER '12345' (1, 13) (1, 18)
155155
>>> dump_tokens("0xFF & 0x15 | 1234")
156156
NUMBER '0xFF' (1, 0) (1, 4)
157157
OP '&' (1, 5) (1, 6)
@@ -161,23 +161,23 @@
161161
162162
Long integers
163163
164-
>>> dump_tokens("x = 0L")
164+
>>> dump_tokens("x = 0")
165165
NAME 'x' (1, 0) (1, 1)
166166
OP '=' (1, 2) (1, 3)
167-
NUMBER '0L' (1, 4) (1, 6)
167+
NUMBER '0' (1, 4) (1, 5)
168168
>>> dump_tokens("x = 0xfffffffffff")
169169
NAME 'x' (1, 0) (1, 1)
170170
OP '=' (1, 2) (1, 3)
171171
NUMBER '0xffffffffff (1, 4) (1, 17)
172-
>>> dump_tokens("x = 123141242151251616110l")
172+
>>> dump_tokens("x = 123141242151251616110")
173173
NAME 'x' (1, 0) (1, 1)
174174
OP '=' (1, 2) (1, 3)
175-
NUMBER '123141242151 (1, 4) (1, 26)
176-
>>> dump_tokens("x = -15921590215012591L")
175+
NUMBER '123141242151 (1, 4) (1, 25)
176+
>>> dump_tokens("x = -15921590215012591")
177177
NAME 'x' (1, 0) (1, 1)
178178
OP '=' (1, 2) (1, 3)
179179
OP '-' (1, 4) (1, 5)
180-
NUMBER '159215902150 (1, 5) (1, 23)
180+
NUMBER '159215902150 (1, 5) (1, 22)
181181
182182
Floating point numbers
183183
@@ -236,38 +236,38 @@
236236
STRING '"doesn\\'t "' (1, 4) (1, 14)
237237
NAME 'shrink' (1, 14) (1, 20)
238238
STRING '", does it"' (1, 20) (1, 31)
239-
>>> dump_tokens("x = u'abc' + U'ABC'")
239+
>>> dump_tokens("x = 'abc' + 'ABC'")
240240
NAME 'x' (1, 0) (1, 1)
241241
OP '=' (1, 2) (1, 3)
242-
STRING "u'abc'" (1, 4) (1, 10)
243-
OP '+' (1, 11) (1, 12)
244-
STRING "U'ABC'" (1, 13) (1, 19)
242+
STRING "'abc'" (1, 4) (1, 9)
243+
OP '+' (1, 10) (1, 11)
244+
STRING "'ABC'" (1, 12) (1, 17)
245245
>>> dump_tokens('y = "ABC" + "ABC"')
246246
NAME 'y' (1, 0) (1, 1)
247247
OP '=' (1, 2) (1, 3)
248-
STRING '"ABC"' (1, 4) (1, 10)
249-
OP '+' (1, 11) (1, 12)
250-
STRING '"ABC"' (1, 13) (1, 19)
248+
STRING '"ABC"' (1, 4) (1, 9)
249+
OP '+' (1, 10) (1, 11)
250+
STRING '"ABC"' (1, 12) (1, 17)
251251
>>> dump_tokens("x = r'abc' + r'ABC' + R'ABC' + R'ABC'")
252252
NAME 'x' (1, 0) (1, 1)
253253
OP '=' (1, 2) (1, 3)
254-
STRING "r'abc'" (1, 4) (1, 11)
255-
OP '+' (1, 12) (1, 13)
256-
STRING "r'ABC'" (1, 14) (1, 21)
257-
OP '+' (1, 22) (1, 23)
258-
STRING "R'ABC'" (1, 24) (1, 31)
259-
OP '+' (1, 32) (1, 33)
260-
STRING "R'ABC'" (1, 34) (1, 41)
254+
STRING "r'abc'" (1, 4) (1, 10)
255+
OP '+' (1, 11) (1, 12)
256+
STRING "r'ABC'" (1, 13) (1, 19)
257+
OP '+' (1, 20) (1, 21)
258+
STRING "R'ABC'" (1, 22) (1, 28)
259+
OP '+' (1, 29) (1, 30)
260+
STRING "R'ABC'" (1, 31) (1, 37)
261261
>>> dump_tokens('y = r"abc" + r"ABC" + R"ABC" + R"ABC"')
262262
NAME 'y' (1, 0) (1, 1)
263263
OP '=' (1, 2) (1, 3)
264-
STRING 'r"abc"' (1, 4) (1, 11)
265-
OP '+' (1, 12) (1, 13)
266-
STRING 'r"ABC"' (1, 14) (1, 21)
267-
OP '+' (1, 22) (1, 23)
268-
STRING 'R"ABC"' (1, 24) (1, 31)
269-
OP '+' (1, 32) (1, 33)
270-
STRING 'R"ABC"' (1, 34) (1, 41)
264+
STRING 'r"abc"' (1, 4) (1, 10)
265+
OP '+' (1, 11) (1, 12)
266+
STRING 'r"ABC"' (1, 13) (1, 19)
267+
OP '+' (1, 20) (1, 21)
268+
STRING 'R"ABC"' (1, 22) (1, 28)
269+
OP '+' (1, 29) (1, 30)
270+
STRING 'R"ABC"' (1, 31) (1, 37)
271271
272272
Operators
273273
@@ -359,7 +359,7 @@
359359
360360
Additive
361361
362-
>>> dump_tokens("x = 1 - y + 15 - 01 + 0x124 + z + a[5]")
362+
>>> dump_tokens("x = 1 - y + 15 - 1 + 0x124 + z + a[5]")
363363
NAME 'x' (1, 0) (1, 1)
364364
OP '=' (1, 2) (1, 3)
365365
NUMBER '1' (1, 4) (1, 5)
@@ -368,16 +368,16 @@
368368
OP '+' (1, 10) (1, 11)
369369
NUMBER '15' (1, 12) (1, 14)
370370
OP '-' (1, 15) (1, 16)
371-
NUMBER '01' (1, 17) (1, 19)
372-
OP '+' (1, 20) (1, 21)
373-
NUMBER '0x124' (1, 22) (1, 27)
374-
OP '+' (1, 28) (1, 29)
375-
NAME 'z' (1, 30) (1, 31)
376-
OP '+' (1, 32) (1, 33)
377-
NAME 'a' (1, 34) (1, 35)
378-
OP '[' (1, 35) (1, 36)
379-
NUMBER '5' (1, 36) (1, 37)
380-
OP ']' (1, 37) (1, 38)
371+
NUMBER '1' (1, 17) (1, 18)
372+
OP '+' (1, 19) (1, 20)
373+
NUMBER '0x124' (1, 21) (1, 26)
374+
OP '+' (1, 27) (1, 28)
375+
NAME 'z' (1, 29) (1, 30)
376+
OP '+' (1, 31) (1, 32)
377+
NAME 'a' (1, 33) (1, 34)
378+
OP '[' (1, 34) (1, 35)
379+
NUMBER '5' (1, 35) (1, 36)
380+
OP ']' (1, 36) (1, 37)
381381
382382
Multiplicative
383383

0 commit comments

Comments
 (0)