8000 Support for functions producing generic functions by sixolet · Pull Request #3113 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Support for functions producing generic functions #3113

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 40 commits into from
Apr 21, 2017
Merged

Support for functions producing generic functions #3113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
679a172
Make it an error to use a class-attribute type var outside a type
sixolet Apr 1, 2017
74e9262
Fix the error message to handle more cases
sixolet Apr 1, 2017
5470c77
oops accidentally changed a file
sixolet Apr 1, 2017
12def8b
Typo fix
sixolet Apr 1, 2017
52782fe
more checking things in tests
sixolet Apr 1, 2017
0184595
Change error message
sixolet Apr 1, 2017
757a6b8
Change error message
sixolet Apr 1, 2017
57bca93
Make TypeQuery more general, handling nonboolean queries.
sixolet Mar 29, 2017
3b8bc23
Remove redundant empty check
sixolet Mar 29, 2017
82da335
Some types in the visitor were missing recursion
sixolet Mar 30, 2017
9f12644
Add ellipsis type handler to TypeQuery
sixolet Mar 30, 2017
8cf4fa6
Typechecks, but gives spurious error. Need to move variable binding?
sixolet Mar 30, 2017
2634277
Small change: Move tvar id generation nearer type analysis
sixolet Mar 30, 2017
30dba10
Even nearer
sixolet Mar 30, 2017
7b4f9f2
Replace the concept of BOUND_TVAR and UNBOUND_TVAR as mutative flags …
sixolet Mar 30, 2017
daf9592
Mid debugging gotta push now
sixolet Mar 30, 2017
826b9cf
Checkpoint. Most tests pass, classvar type aliases not yet
sixolet Mar 31, 2017
4141f94
forgot this file
sixolet Mar 31, 2017
58e3a2a
Fix aliasing to not bind type vars within a callable while aliasing
sixolet Mar 31, 2017
c061a09
removed some now-unused code
sixolet Apr 1, 2017
603013d
my own code review, first pass
sixolet Apr 1, 2017
c6fec63
Use type var query instead of another query fn
sixolet Apr 2, 2017
f46d52a
Tighten code
sixolet Apr 2, 2017
ea21337
fix some types
sixolet Apr 2, 2017
80d62a7
Use same type alias throughout
sixolet Apr 2, 2017
eaf8c0d
Make semanal tests pass. Delete one I think is wrong
sixolet Apr 2, 2017
5009a2b
Generator types for generators
sixolet Apr 2, 2017
7c64464
Lint and cleanups
sixolet Apr 3, 2017
a866d0f
Test for using generic function return as a decorator
sixolet Apr 11, 2017
9d5c630
Merge upstream
sixolet Apr 12, 2017
4683d70
Merge lint
sixolet Apr 12, 2017
cbb3cb0
Merged master; adapted code to use better TypeQuery
sixolet Apr 12, 2017
da0d936
More tests for nested and multi-type-var situations
sixolet Apr 12, 2017
edbecb0
Fixed type variable scoping rules to conform to PEP484 better
sixolet Apr 14, 2017
21d8b13
Move the typevars that are prohibited due to being bound by the class…
sixolet Apr 17, 2017
214aebc
More doc
sixolet Apr 17, 2017
5405646
Jukka comments
sixolet Apr 20, 2017
a25e926
one more
sixolet Apr 20, 2017
4aaab6c
get imports right
sixolet Apr 20, 2017
fd153ad
Merge branch 'master' into second-order-decorator
sixolet Apr 20, 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
Make semanal tests pass. Delete one I think is wrong
  • Loading branch information
@sixolet
sixolet committed Apr 2, 2017
commit eaf8c0de55fbd447af2f606d015d33d3d85ff500
6 changes: 3 additions & 3 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def analyze_function(self, defn: FuncItem) -> None:
assert isinstance(defn.type, CallableType)
# Signature must be analyzed in the surrounding scope so that
# class-level imported names and type variables are in scope.
defn.type = self.anal_type(defn.type)
defn.type = self.type_analyzer().visit_callable_type(defn.type, nested=False)
self.check_function_signature(defn)
if isinstance(defn, FuncDef):
defn.type = set_callable_name(defn.type, defn)
Expand Down Expand Up @@ -2972,14 +2972,14 @@ def visit_await_expr(self, expr: AwaitExpr) -> None:
#

@contextmanager
def new_tvar_scope(self):
def new_tvar_scope(self) -> None:
old_scope = self.tvar_scope
self.tvar_scope = TypeVarScope()
yield
self.tvar_scope = old_scope

@contextmanager
def tvar_scope_frame(self):
def tvar_scope_frame(self) -> None:
old_scope = self.tvar_scope
self.tvar_scope = TypeVarScope(self.tvar_scope)
yield
Expand Down
8 changes: 4 additions & 4 deletions mypy/typeanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,14 @@ def visit_instance(self, t: Instance) -> Type:
def visit_type_var(self, t: TypeVarType) -> Type:
return t

def visit_callable_type(self, t: CallableType) -> Type:
def visit_callable_type(self, t: CallableType, nested: bool = True) -> Type:
with self.tvar_scope_frame():
Copy link
Collaborator 8000 Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above line is the punchline of this diff. Make a layer of type variable scope when analyzing a callable type, so it can bind its own type variables if it needs to.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a code comment with contents similar to the second sentence in the above comment?

if self.aliasing:
variables = t.variables
else:
variables = self.bind_function_type_variables(t, t)
ret = t.copy_modified(arg_types=self.anal_array(t.arg_types, nested=False),
ret_type=self.anal_type(t.ret_type, nested=False),
ret = t.copy_modified(arg_types=self.anal_array(t.arg_types, nested=nested),
ret_type=self.anal_type(t.ret_type, nested=nested),
fallback=t.fallback or self.builtin_type('builtins.function'),
variables=self.anal_var_defs(variables))
return ret
Expand Down Expand Up @@ -398,7 +398,7 @@ def analyze_callable_type(self, t: UnboundType) -> Type:
return ret.accept(self)

@contextmanager
def tvar_scope_frame(self):
def tvar_scope_frame(self) -> None:
old_scope = self.tvar_scope
self.tvar_scope = TypeVarScope(self.tvar_scope)
yield
Expand Down
8 changes: 0 additions & 8 deletions test-data/unit/semanal-errors.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,14 +940,6 @@ from typing import Generic
class A(Generic[int]): pass # E: Free type variable expected in Generic[...]
[out]

[case testInvalidTypeWithinNestedGenericClass]
from typing import Generic, TypeVar
T = TypeVar('T')
class A(Generic[T]):
class B(Generic[T]): pass \
# E: Free type variable expected in Generic[...]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appears in PEP 484 as an example of an error. I think it should still be prohibited.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yes, you're totally right. According to PEP484 you can neither make the inner class generic in the same tvar, nor use the outer tvar in the inner class. I'll adjust as necessary.

[out]

[case testIncludingGenericTwiceInBaseClassList]
from typing import Generic, TypeVar
T = TypeVar('T')
Expand Down
0