1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
|
# flake8: noqa
# Our flake extension misfires on type comments in strings below.
from lib2to3.tests.test_fixers import FixerTestCase
# deadcode: fix_annotate is used as part of the fixer_pkg for this test
from pyannotate_tools.fixes import fix_annotate
class TestFixAnnotate(FixerTestCase):
def setUp(self):
super(TestFixAnnotate, self).setUp(
fix_list=["annotate"],
fixer_pkg="pyannotate_tools",
options={'annotation_style' : 'py2'},
)
def test_no_arg(self):
a = """\
def nop():
return 42
"""
b = """\
from typing import Any
def nop():
# type: () -> Any
return 42
"""
self.check(a, b)
def test_one_arg(self):
a = """\
def incr(arg):
return arg+1
"""
b = """\
from typing import Any
def incr(arg):
# type: (Any) -> Any
return arg+1
"""
self.check(a, b)
def test_two_args(self):
a = """\
def add(arg1, arg2):
return arg1+arg2
"""
b = """\
from typing import Any
def add(arg1, arg2):
# type: (Any, Any) -> Any
return arg1+arg2
"""
self.check(a, b)
def test_defaults(self):
a = """\
def foo(iarg=0, farg=0.0, sarg='', uarg=u'', barg=False):
return 42
"""
b = """\
from typing import Any
def foo(iarg=0, farg=0.0, sarg='', uarg=u'', barg=False):
# type: (int, float, str, unicode, bool) -> Any
return 42
"""
self.check(a, b)
def test_staticmethod(self):
a = """\
class C:
@staticmethod
def incr(self):
return 42
"""
b = """\
from typing import Any
class C:
@staticmethod
def incr(self):
# type: (Any) -> Any
return 42
"""
self.check(a, b)
def test_classmethod(self):
a = """\
class C:
@classmethod
def incr(cls, arg):
return 42
"""
b = """\
from typing import Any
class C:
@classmethod
def incr(cls, arg):
# type: (Any) -> Any
return 42
"""
self.check(a, b)
def test_instancemethod(self):
a = """\
class C:
def incr(self, arg):
return 42
"""
b = """\
from typing import Any
class C:
def incr(self, arg):
# type: (Any) -> Any
return 42
"""
self.check(a, b)
def test_fake_self(self):
a = """\
def incr(self, arg):
return 42
"""
b = """\
from typing import Any
def incr(self, arg):
# type: (Any, Any) -> Any
return 42
"""
self.check(a, b)
def test_nested_fake_self(self):
a = """\
class C:
def outer(self):
def inner(self, arg):
return 42
"""
b = """\
from typing import Any
class C:
def outer(self):
# type: () -> None
def inner(self, arg):
# type: (Any, Any) -> Any
return 42
"""
self.check(a, b)
def test_multiple_decorators(self):
a = """\
class C:
@contextmanager
@classmethod
@wrapped('func')
def incr(cls, arg):
return 42
"""
b = """\
from typing import Any
class C:
@contextmanager
@classmethod
@wrapped('func')
def incr(cls, arg):
# type: (Any) -> Any
return 42
"""
self.check(a, b)
def test_stars(self):
a = """\
def stuff(*a, **kw):
return 4, 2
"""
b = """\
from typing import Any
def stuff(*a, **kw):
# type: (*Any, **Any) -> Any
return 4, 2
"""
self.check(a, b)
def test_idempotency(self):
a = """\
def incr(arg):
# type: (Any) -> Any
return arg+1
"""
self.unchanged(a)
def test_no_return_expr(self):
a = """\
def proc1(arg):
return
def proc2(arg):
pass
"""
b = """\
from typing import Any
def proc1(arg):
# type: (Any) -> None
return
def proc2(arg):
# type: (Any) -> None
pass
"""
self.check(a, b)
def test_nested_return_expr(self):
# The 'return expr' in inner() shouldn't affect the return type of outer().
a = """\
def outer(arg):
def inner():
return 42
return
"""
b = """\
from typing import Any
def outer(arg):
# type: (Any) -> None
def inner():
# type: () -> Any
return 42
return
"""
self.check(a, b)
def test_nested_class_return_expr(self):
# The 'return expr' in class Inner shouldn't affect the return type of outer().
a = """\
def outer(arg):
class Inner:
return 42
return
"""
b = """\
from typing import Any
def outer(arg):
# type: (Any) -> None
class Inner:
return 42
return
"""
self.check(a, b)
def test_add_import(self):
a = """\
import typing
from typing import Callable
def incr(arg):
return 42
"""
b = """\
import typing
from typing import Callable
from typing import Any
def incr(arg):
# type: (Any) -> Any
return 42
"""
self.check(a, b)
def test_dont_add_import(self):
a = """\
def nop(arg=0):
return
"""
b = """\
def nop(arg=0):
# type: (int) -> None
return
"""
self.check(a, b)
def test_long_form(self):
self.maxDiff = None
a = """\
def nop(arg0, arg1, arg2, arg3, arg4,
arg5, arg6, arg7, arg8=0, arg9='',
*args, **kwds):
return
"""
b = """\
from typing import Any
def nop(arg0, # type: Any
arg1, # type: Any
arg2, # type: Any
arg3, # type: Any
arg4, # type: Any
arg5, # type: Any
arg6, # type: Any
arg7, # type: Any
arg8=0, # type: int
arg9='', # type: str
*args, # type: Any
**kwds # type: Any
):
# type: (...) -> None
return
"""
self.check(a, b)
def test_long_form_trailing_comma(self):
self.maxDiff = None
a = """\
def nop(arg0, arg1, arg2, arg3, arg4, arg5, arg6,
arg7=None, arg8=0, arg9='', arg10=False,):
return
"""
b = """\
from typing import Any
def nop(arg0, # type: Any
arg1, # type: Any
arg2, # type: Any
arg3, # type: Any
arg4, # type: Any
arg5, # type: Any
arg6, # type: Any
arg7=None, # type: Any
arg8=0, # type: int
arg9='', # type: str
arg10=False, # type: bool
):
# type: (...) -> None
return
"""
self.check(a, b)
def test_one_liner(self):
a = """\
class C:
def nop(self, a): a = a; return a
# Something
# More
pass
"""
b = """\
from typing import Any
class C:
def nop(self, a):
# type: (Any) -> Any
a = a; return a
# Something
# More
pass
"""
self.check(a, b)
def test_idempotency_long_1arg(self):
a = """\
def nop(a # type: int
):
pass
"""
self.unchanged(a)
def test_idempotency_long_1arg_comma(self):
a = """\
def nop(a, # type: int
):
pass
"""
self.unchanged(a)
def test_idempotency_long_2args_first(self):
a = """\
def nop(a, # type: int
b):
pass
"""
self.unchanged(a)
def test_idempotency_long_2args_last(self):
a = """\
def nop(a,
b # type: int
):
pass
"""
self.unchanged(a)
def test_idempotency_long_varargs(self):
a = """\
def nop(*a # type: int
):
pass
"""
self.unchanged(a)
def test_idempotency_long_kwargs(self):
a = """\
def nop(**a # type: int
):
pass
"""
self.unchanged(a)
|
