8000 Allow overloads in source files, not just stubs by sixolet · Pull Request #2603 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Allow overloads in source files, not just stubs #2603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Mar 27, 2017
Merged

Allow overloads in source files, not just stubs #2603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e59f264
Overloads in source files, not just stub files
sixolet Dec 22, 2016
bb5fdae
Properties count as overloads too
sixolet Dec 23, 2016
ecb5f73
tests and fixes and types and such
sixolet Dec 23, 2016
435751d
Add impl & test for fastparse2
sixolet Dec 23, 2016
7b3c08d
Temporary checkpoint -- most tests pass but not overloads in classes
sixolet Feb 16, 2017
6296587
Partly-programatically modify all non-impl overload tests to be in st…
sixolet Feb 16, 2017
91b1726
Refactor so that overload decides on its impl at semanal time
sixolet Feb 17, 2017
dbc770c
Guido comments and polish
sixolet Feb 17, 2017
80fc979
s/cannot/does not/
sixolet Feb 17, 2017
045be3e
Fix windows paths when expanding errors in non-main files
sixolet Feb 17, 2017
95555e6
Another theory about how to make windows paths work
sixolet Feb 17, 2017
c12a9fd
It is simpler to have OverloadPart be a union
sixolet Feb 17, 2017
143692a
Merge master
sixolet Mar 14, 2017
04ce906
Many of Guidos comments
sixo 8000 let Mar 15, 2017
a191620
Test implementation with type variables, and fix the bugs
sixolet Mar 23, 2017
b24d2ec
lint
sixolet Mar 23, 2017
9fa66f4
remove extra blank linkes
sixolet Mar 25, 2017
c6c6d03
Put is_overload in correct else clause
sixolet Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Another theory about how to make windows paths work
  • Loading branch information
@sixolet
sixolet committed Feb 17, 2017
commit 95555e66f74d6e155a755840a47475a3bb24416c
1 change: 0 additions & 1 deletion mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,7 +3186,6 @@ def visit_func_def(self, func: FuncDef) -> None:
sem.function_stack.pop()

def visit_overloaded_func_def(self, func: OverloadedFuncDef) -> None:
# REFACTOR: Visit all bodies
kind = self.kind_by_scope()
if kind == GDEF:
self.sem.check_no_global(func.name(), func, True)
Expand Down
14 changes: 8 additions & 6 deletions mypy/test/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import os.path
import os
import posixpath
import re
from os import remove, rmdir
import shutil
Expand All @@ -27,7 +28,10 @@ def parse_test_cases(
myunit and pytest codepaths -- if something looks redundant,
that's likely the reason.
"""

if native_sep:
join = os.path.join
else:
join = posixpath.join # type: ignore
if not include_path:
include_path = os.path.dirname(path)
with open(path, encoding='utf-8') as f:
Expand Down Expand Up @@ -57,7 +61,7 @@ def parse_test_cases(
# Record an extra file needed for the test case.
arg = p[i].arg
assert arg is not None
file_entry = (os.path.join(base_path, arg), '\n'.join(p[i].data))
file_entry = (join(base_path, arg), '\n'.join(p[i].data))
if p[i].id == 'file':
files.append(file_entry)
elif p[i].id == 'outfile':
Expand All @@ -66,14 +70,14 @@ def parse_test_cases(
# Use a custom source file for the std module.
arg = p[i].arg
assert arg is not None
mpath = os.path.join(os.path.dirname(path), arg)
mpath = join(os.path.dirname(path), arg)
if p[i].id == 'builtins':
fnam = 'builtins.pyi'
else:
# Python 2
fnam = '__builtin__.pyi'
with open(mpath) as f:
files.append((os.path.join(base_path, fnam), f.read()))
files.append((join(base_path, fnam), f.read()))
elif p[i].id == 'stale':
arg = p[i].arg
if arg is None:
Expand Down Expand Up @@ -119,8 +123,6 @@ def parse_test_cases(
input = expand_includes(p[i0].data, include_path)
expand_errors(input, tcout, 'main')
for file_path, contents in files:
if native_sep and os.path.sep == '\\':
file_path = fix_win_path(file_path)
expand_errors(contents.split('\n'), tcout, file_path)
lastline = p[i].line if i < len(p) else p[i - 1].line + 9999
tc = DataDrivenTestCase(p[i0].arg, input, tcout, tcout2, path,
Expand Down
0