Copy ClassVar upstream #280

ilevkivskyi · 2016-09-09T08:55:40Z

I added ClassVar to both Python2 and Python3 (and new version of get_type_hints to Python3 version) in a backward compatible manner.

@gvanrossum Please, take a look.

ilevkivskyi · 2016-09-09T10:04:04Z

It looks like tests for 3.6 are failing because they are run on 3.6a4

    x = 5; y: Optional['C'] = None
              ^
SyntaxError: invalid syntax

other tests are OK

ilevkivskyi · 2016-09-09T10:09:59Z

I removed the test modules, anyway they are failing now (SyntaxError), but they will be in 3.6b1 test suite and will work.

gvanrossum · 2016-09-09T16:51:56Z

src/test_typing.py

@@ -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


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.)

gvanrossum · 2016-09-09T17:40:59Z

Regarding the test failure for the 3.6 nightly build, some guesses as to why it fails to import ann_module from test:

maybe the nightly build Travis CI uses is only built once a night?
maybe it's built using some Debian/Ubuntu build recipe that doesn't include the test package?
the SystemError is a known bug in the brand-new compact dict implementation, it will be fixed soon
hopefully all these would be solved by moving the annotation syntax tests out of test_typing.py.

gvanrossum · 2016-09-09T17:49:31Z

Hm, I just looked more carefully and those three modules are imported to test get_type_hints(). I think that can to be done somewhat differently, using the same pattern as used for PY35_TESTS.

ilevkivskyi · 2016-09-09T21:06:26Z

@gvanrossum
I tried to restructure tests a bit. I still get

    exec(PY36_TESTS)
File "<string>", line 6
    x: ClassVar[Optional['B']] = None
      ^
SyntaxError: invalid syntax

I import modules, to check that get_type_hints also works on modules, and to check that it correctly evaluates forward references in namespaces of modules.

gvanrossum · 2016-09-09T21:10:47Z

Looks like the nightly build doesn't even have PEP 526 support yet... Let's just wait a day.

gvanrossum · 2016-09-09T21:11:28Z

Can you at least get that test to pass with a 3.6 built from the HEAD locally?

ilevkivskyi · 2016-09-09T21:28:12Z

I just did hg pull and hg checkout tip and I cannot build Python, it returns veeeery long error ending in

Modules/_sre.o:/home/ivan/Devel/hg-cpython/./Modules/sre_lib.h:543: more undefined references to `PyErr_CheckSignals' follow
collect2: error: ld returned 1 exit status
make: *** [Programs/_freeze_importlib] Error 1

gvanrossum · 2016-09-09T21:30:42Z

try make clean or make clobber?

On Fri, Sep 9, 2016 at 2:28 PM, Ivan Levkivskyi [email protected]
wrote:

I just did hg pull and hg checkout tip and I cannot build Python, it
returns veeeery long error ending in

Modules/_sre.o:/home/ivan/Devel/hg-cpython/./Modules/sre_lib.h:543: more undefined references to `PyErr_CheckSignals' follow
collect2: error: ld returned 1 exit status
make: *** [Programs/_freeze_importlib] Error 1

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#280 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ACwrMmG85aAsptbFWudTgcCv_5BU3h4Kks5qoc9tgaJpZM4J41iV
.

--Guido van Rossum (python.org/~guido)

gvanrossum · 2016-09-09T21:32:33Z

Or cp Modules/Setup.dist Modules/Setup

On Fri, Sep 9, 2016 at 2:30 PM, Guido van Rossum [email protected]
wrote:

try make clean or make clobber?

On Fri, Sep 9, 2016 at 2:28 PM, Ivan Levkivskyi [email protected]
wrote:

I just did hg pull and hg checkout tip and I cannot build Python, it
returns veeeery long error ending in

Modules/_sre.o:/home/ivan/Devel/hg-cpython/./Modules/sre_lib.h:543:
more undefined references to `PyErr_CheckSignals' follow
collect2: error: ld returned 1 exit status
make: *** [Programs/_freeze_importlib] Error 1

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#280 (comment), or
mute
the thread
<https://github.com/notifications/unsubscribe-
auth/ACwrMmG85aAsptbFWudTgcCv_5BU3h4Kks5qoc9tgaJpZM4J41iV>
.

--Guido van Rossum (python.org/~guido)

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#280 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ACwrMsgYaCkTG-8K78AC_tcuw-lQVDKSks5qodADgaJpZM4J41iV
.

--Guido van Rossum (python.org/~guido)

gvanrossum · 2016-09-09T21:33:43Z

OK, I managed that and get these errors:

======================================================================
ERROR: test_get_type_hints_ClassVar (__main__.GetTypeHintTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test_typing.py", line 1214, in test_get_type_hints_ClassVar
    self.assertEqual(gth(B, locals()),
  File "/Users/guido/src/typing/src/typing.py", line 1296, in get_type_hints
    value = _eval_type(value, globalns, localns)
  File "/Users/guido/src/typing/src/typing.py", line 288, in _eval_type
    return t._eval_type(globalns, localns)
  File "/Users/guido/src/typing/src/typing.py", line 1154, in _eval_type
    return type(self)(_eval_type(self.__type__, globalns, localns),
  File "/Users/guido/src/typing/src/typing.py", line 288, in _eval_type
    return t._eval_type(globalns, localns)
  File "/Users/guido/src/typing/src/typing.py", line 524, in _eval_type
    for t in self.__union_params__)
  File "/Users/guido/src/typing/src/typing.py", line 524, in <genexpr>
    for t in self.__union_params__)
  File "/Users/guido/src/typing/src/typing.py", line 288, in _eval_type
    return t._eval_type(globalns, localns)
  File "/Users/guido/src/typing/src/typing.py", line 175, in _eval_type
    eval(self.__forward_code__, globalns, localns),
  File "<string>", line 1, in <module>
NameError: name 'B' is not defined

----------------------------------------------------------------------

ilevkivskyi · 2016-09-09T21:35:50Z

@gvanrossum
I have fixed this one just replace locals() with globals() (now the class is executed there after refactoring)
But now I get another one
with ChainMap({}, {} ,[}, [}, {}, [})

ilevkivskyi · 2016-09-09T21:39:14Z

@gvanrossum
Also I don't understand where this comes from

======================================================================
ERROR: test_type_optional (test.test_typing.TypeTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ivan/Devel/hg-cpython/Lib/test/test_typing.py", line 1529, in test_type_optional
    A = Optional[Type[BaseException]]
  File "/home/ivan/Devel/hg-cpython/Lib/typing.py", line 647, in __getitem__
    return Union[arg, type(None)]
  File "/home/ivan/Devel/hg-cpython/Lib/typing.py", line 550, in __getitem__
    dict(self.__dict__), parameters, _root=True)
  File "/home/ivan/Devel/hg-cpython/Lib/typing.py", line 510, in __new__
    for t2 in all_params - {t1} if not isinstance(t2, TypeVar)):
  File "/home/ivan/Devel/hg-cpython/Lib/typing.py", line 510, in <genexpr>
    for t2 in all_params - {t1} if not isinstance(t2, TypeVar)):
  File "/home/ivan/Devel/hg-cpython/Lib/typing.py", line 1075, in __subclasscheck__
    if super().__subclasscheck__(cls):
  File "/home/ivan/Devel/hg-cpython/Lib/abc.py", line 225, in __subclasscheck__
    for scls in cls.__subclasses__():
TypeError: descriptor '__subclasses__' of 'type' object needs an argument

ilevkivskyi · 2016-09-09T21:42:27Z

OK, but the previous version of test_typing still passes!
I need some time to fix the new one.

gvanrossum · 2016-09-09T21:43:46Z

Do you need more help?

ilevkivskyi · 2016-09-09T21:46:11Z

I will try to fix it, and if will not manage within 30 minutes, then I will ask for help :-)

Thanks!

ilevkivskyi · 2016-09-09T22:14:37Z

@gvanrossum

I have fixed all tests locally, the most important fix was to also copy typing to hg tip that means that python/typing is ahead and here are some changes that are not integrated in master hg repo.

The easiest fix would be to just copy what we have here (both typing and test_typing) to master hg repo. Could you please do this (of course if you are satisfied with the PR)?

gvanrossum · 2016-09-09T22:15:21Z

Yay! It works! I'll wait to merge until the nightly build has variable annotations. I also want to port this to the cpython repo.

ilevkivskyi · 2016-09-10T15:21:01Z

@gvanrossum
I pushed an empty commit to trigger Travis, it looks like all green now.

gvanrossum · 2016-09-10T16:30:34Z

Thanks!!

ilevkivskyi added 9 commits September 9, 2016 10:34

Copy typing upstream (including ClassVar for Python2)

d20c39e

update docstring for Python2

5d19448

Make Python3 tests backward compatible

69ff019

Fixed metaclass for Python2

66921dc

Fixed ChainMap also in tpying for 3.2

5a706c0

ClassVar must be defined before Any in Python2

69a4502

Attempt at prohibiting subclasses of ClassVar in Python2

0b9092d

Try alternative location for test modules

7089f66

Corrected import

c43cac5

Remove test modules

37f14ad

ilevkivskyi changed the title ~~Copy classvar upstream~~ Copy ClassVar upstream Sep 9, 2016

gvanrossum reviewed Sep 9, 2016
View reviewed changes

Restructured test_typing a bit. ann_modules still imported

b1d3d1e

Fixed bugs after refoactorig tests

3c08107

Trigger TRavis CI

33f55d7

gvanrossum merged commit 2dd068b into python:master Sep 10, 2016

dotlambda mentioned this pull request Feb 3, 2018

Python package updates NixOS/nixpkgs#34553

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Copy ClassVar upstream #280

Copy ClassVar upstream #280

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 10, 2016

gvanrossum commented Sep 10, 2016

Copy ClassVar upstream #280

Copy ClassVar upstream #280

Conversation

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum Sep 9, 2016

Choose a reason for hiding this comment

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

ilevkivskyi commented Sep 9, 2016

gvanrossum commented Sep 9, 2016

ilevkivskyi commented Sep 10, 2016

gvanrossum commented Sep 10, 2016