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

Show file tree
Hide file tree
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
Remove test modules
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Sep 9, 2016
commit 37f14ad6463b0845903c3e7a6c09ffff53dd069b
53 changes: 0 additions & 53 deletions src/ann_module.py
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/ann_module2.py
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/ann_module3.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
from unittest import TestCase, main, skipUnless, SkipTest
if sys.version_info[:2] >= (3, 6):
import ann_module, ann_module2, ann_module3
from test import ann_module, ann_module2, ann_module3

@gvanrossum gvanrossum Sep 9, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Honestly I think this points to a different problem.

The stdlib tests for variable annotations syntax should be moved to a different file altogether (maybe test_annotations.py?). Then we won't need this stuff here. (Also, I really want the text of typing.py and test_typing.py to be identical in Py3.5, Py3.6, and here.)

from collections import ChainMap
from textwrap import dedent

Expand Down