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

Skip to content

Copy ClassVar upstream #280

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
gvanrossum merged 13 commits into from
Sep 10, 2016
Merged

Copy ClassVar upstream #280

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d20c39e
Copy typing upstream (including ClassVar for Python2)
ilevkivskyi Sep 9, 2016
5d19448
update docstring for Python2
ilevkivskyi Sep 9, 2016
69ff019
Make Python3 tests backward compatible
ilevkivskyi Sep 9, 2016
66921dc
Fixed metaclass for Python2
ilevkivskyi Sep 9, 2016
5a706c0
Fixed ChainMap also in tpying for 3.2
ilevkivskyi Sep 9, 2016
69a4502
ClassVar must be defined before Any in Python2
ilevkivskyi Sep 9, 2016
0b9092d
Attempt at prohibiting subclasses of ClassVar in Python2
ilevkivskyi Sep 9, 2016
7089f66
Try alternative location for test modules
ilevkivskyi Sep 9, 2016
c43cac5
Corrected import
ilevkivskyi Sep 9, 2016
37f14ad
Remove test modules
ilevkivskyi Sep 9, 2016
b1d3d1e
Restructured test_typing a bit. ann_modules still imported
ilevkivskyi Sep 9, 2016
3c08107
Fixed bugs after refoactorig tests
ilevkivskyi Sep 9, 2016
33f55d7
Trigger TRavis CI
ilevkivskyi Sep 10, 2016
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
Fixed bugs after refoactorig tests
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Sep 9, 2016
commit 3c0810726b3d369ccc555d7c4834c45857d2a8d3
10 changes: 5 additions & 5 deletions src/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,8 +1165,8 @@ def __anext__(self) -> T_a:
class B:
x: ClassVar[Optional['B']] = None
y: int
class C(B):
z: ClassVar['C'] = B()
class CSub(B):
z: ClassVar['CSub'] = B()
class G(Generic[T]):
lst: ClassVar[List[T]] = []
"""
Expand Down Expand Up @@ -1211,10 +1211,10 @@ def testf(x, y): ...

@skipUnless(PY36, 'Python 3.6 required')
def test_get_type_hints_ClassVar(self):
self.assertEqual(gth(B, locals()),
self.assertEqual(gth(B, globals()),
ChainMap({'y': int, 'x': ClassVar[Optional[B]]}, {}))
self.assertEqual(gth(C, locals()),
ChainMap({'z': ClassVar[C]},
self.assertEqual(gth(CSub, globals()),
ChainMap({'z': ClassVar[CSub]},
{'y': int, 'x': ClassVar[Optional[B]]}, {}))
self.assertEqual(gth(G), ChainMap({'lst': ClassVar[List[T]]},{},{}))

Expand Down