Mailman 3 April 2018 - Python-checkins

bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329)
by INADA Naoki April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/29bc6f6347b1e05b22180fd296013bb2a1… commit: 29bc6f6347b1e05b22180fd296013bb2a104d589 branch: 3.6 author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-05T18:08:43+09:00 summary: bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329) Py_UNICODE is deprecated since Python 3.3. But the deprecation is missed in the c-api/arg document. (cherry picked from commit 42ec190) files: A Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst M Doc/c-api/arg.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index e8e7e0d55930..dc58e152a6b5 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -151,19 +151,35 @@ which disallows mutable objects such as :class:`bytearray`. Previously, :exc:`TypeError` was raised when embedded null code points were encountered in the Python string. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``u#`` (:class:`str`) [Py_UNICODE \*, int] This variant on ``u`` stores into two C variables, the first one a pointer to a Unicode data buffer, the second one its length. This variant allows null code points. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z`` (:class:`str` or ``None``) [Py_UNICODE \*] Like ``u``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z#`` (:class:`str` or ``None``) [Py_UNICODE \*, int] Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``U`` (:class:`str`) [PyObject \*] Requires that the Python object is a Unicode object, without attempting any conversion. Raises :exc:`TypeError` if the object is not a Unicode @@ -552,12 +568,13 @@ Building values ``z#`` (:class:`str` or ``None``) [char \*, int] Same as ``s#``. - ``u`` (:class:`str`) [Py_UNICODE \*] - Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4) data to a Python - Unicode object. If the Unicode buffer pointer is *NULL*, ``None`` is returned. + ``u`` (:class:`str`) [wchar_t \*] + Convert a null-terminated :c:type:`wchar_t` buffer of Unicode (UTF-16 or UCS-4) + data to a Python Unicode object. If the Unicode buffer pointer is *NULL*, + ``None`` is returned. - ``u#`` (:class:`str`) [Py_UNICODE \*, int] - Convert a Unicode (UCS-2 or UCS-4) data buffer and its length to a Python + ``u#`` (:class:`str`) [wchar_t \*, int] + Convert a Unicode (UTF-16 or UCS-4) data buffer and its length to a Python Unicode object. If the Unicode buffer pointer is *NULL*, the length is ignored and ``None`` is returned. diff --git a/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst new file mode 100644 index 000000000000..6884640325b0 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst @@ -0,0 +1,3 @@ +Deprecate ``Py_UNICODE`` usage in ``c-api/arg`` document. ``Py_UNICODE`` +related APIs are deprecated since Python 3.3, but it is missed in the +document.

1 0

Add a webhook for Zulip to the Travis configuration (GH-6379)
by Brett Cannon April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/0876505bd32b5ab3a14fa4cc0528d76391… commit: 0876505bd32b5ab3a14fa4cc0528d763916440a8 branch: master author: Brett Cannon <brettcannon(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T19:12:39-07:00 summary: Add a webhook for Zulip to the Travis configuration (GH-6379) files: M .travis.yml diff --git a/.travis.yml b/.travis.yml index af3cdf54654d..fecad290d8bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,6 +149,11 @@ script: notifications: email: false + webhooks: + urls: + - https://python.zulipchat.com/api/v1/external/travis?api_key=QTP4LAknlFml0Nu… + on_success: change + on_failure: always irc: channels: # This is set to a secure variable to prevent forks from notifying the

1 0

bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376)
by Miss Islington (bot) April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/04eac02088f60192c7e54c7364bcaa892d… commit: 04eac02088f60192c7e54c7364bcaa892d7c05cf branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T17:46:40-07:00 summary: bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376) This removes a hack and replaces it with a proper mapping {'list': 'List', 'dict': 'Dict', ...}. (cherry picked from commit 2a363d2930e29ec6d8a774973ed5a4965f881f5f) Co-authored-by: Ivan Levkivskyi <levkivskyi(a)gmail.com> files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index b12e5ea2fb80..390fe60fcc10 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -1058,14 +1058,15 @@ class C(B[int]): self.assertEqual(x.bar, 'abc') self.assertEqual(x.__dict__, {'foo': 42, 'bar': 'abc'}) samples = [Any, Union, Tuple, Callable, ClassVar, - Union[int, str], ClassVar[List], Tuple[int, ...], Callable[[str], bytes]] + Union[int, str], ClassVar[List], Tuple[int, ...], Callable[[str], bytes], + typing.DefaultDict, typing.FrozenSet[int]] for s in samples: for proto in range(pickle.HIGHEST_PROTOCOL + 1): z = pickle.dumps(s, proto) x = pickle.loads(z) self.assertEqual(s, x) more_samples = [List, typing.Iterable, typing.Type, List[int], - typing.Type[typing.Mapping]] + typing.Type[typing.Mapping], typing.AbstractSet[Tuple[int, str]]] for s in more_samples: for proto in range(pickle.HIGHEST_PROTOCOL + 1): z = pickle.dumps(s, proto) diff --git a/Lib/typing.py b/Lib/typing.py index 3ac3b9382262..d45502ffee48 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -611,6 +611,19 @@ def __reduce__(self): # * __args__ is a tuple of all arguments used in subscripting, # e.g., Dict[T, int].__args__ == (T, int). + +# Mapping from non-generic type names that have a generic alias in typing +# but with a different name. +_normalize_alias = {'list': 'List', + 'tuple': 'Tuple', + 'dict': 'Dict', + 'set': 'Set', + 'frozenset': 'FrozenSet', + 'deque': 'Deque', + 'defaultdict': 'DefaultDict', + 'type': 'Type', + 'Set': 'AbstractSet'} + def _is_dunder(attr): return attr.startswith('__') and attr.endswith('__') @@ -629,7 +642,7 @@ def __init__(self, origin, params, *, inst=True, special=False, name=None): self._special = special if special and name is None: orig_name = origin.__name__ - name = orig_name[0].title() + orig_name[1:] + name = _normalize_alias.get(orig_name, orig_name) self._name = name if not isinstance(params, tuple): params = (params,)

1 0

bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376)
by Ivan Levkivskyi April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/2a363d2930e29ec6d8a774973ed5a4965f… commit: 2a363d2930e29ec6d8a774973ed5a4965f881f5f branch: master author: Ivan Levkivskyi <levkivskyi(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-05T01:25:15+01:00 summary: bpo-32873: Remove a name hack for generic aliases in typing module (GH-6376) This removes a hack and replaces it with a proper mapping {'list': 'List', 'dict': 'Dict', ...}. files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index b12e5ea2fb80..390fe60fcc10 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -1058,14 +1058,15 @@ class C(B[int]): self.assertEqual(x.bar, 'abc') self.assertEqual(x.__dict__, {'foo': 42, 'bar': 'abc'}) samples = [Any, Union, Tuple, Callable, ClassVar, - Union[int, str], ClassVar[List], Tuple[int, ...], Callable[[str], bytes]] + Union[int, str], ClassVar[List], Tuple[int, ...], Callable[[str], bytes], + typing.DefaultDict, typing.FrozenSet[int]] for s in samples: for proto in range(pickle.HIGHEST_PROTOCOL + 1): z = pickle.dumps(s, proto) x = pickle.loads(z) self.assertEqual(s, x) more_samples = [List, typing.Iterable, typing.Type, List[int], - typing.Type[typing.Mapping]] + typing.Type[typing.Mapping], typing.AbstractSet[Tuple[int, str]]] for s in more_samples: for proto in range(pickle.HIGHEST_PROTOCOL + 1): z = pickle.dumps(s, proto) diff --git a/Lib/typing.py b/Lib/typing.py index 3ac3b9382262..d45502ffee48 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -611,6 +611,19 @@ def __reduce__(self): # * __args__ is a tuple of all arguments used in subscripting, # e.g., Dict[T, int].__args__ == (T, int). + +# Mapping from non-generic type names that have a generic alias in typing +# but with a different name. +_normalize_alias = {'list': 'List', + 'tuple': 'Tuple', + 'dict': 'Dict', + 'set': 'Set', + 'frozenset': 'FrozenSet', + 'deque': 'Deque', + 'defaultdict': 'DefaultDict', + 'type': 'Type', + 'Set': 'AbstractSet'} + def _is_dunder(attr): return attr.startswith('__') and attr.endswith('__') @@ -629,7 +642,7 @@ def __init__(self, origin, params, *, inst=True, special=False, name=None): self._special = special if special and name is None: orig_name = origin.__name__ - name = orig_name[0].title() + orig_name[1:] + name = _normalize_alias.get(orig_name, orig_name) self._name = name if not isinstance(params, tuple): params = (params,)

1 0

[65 flat] Results for Python (master branch) 2018-04-04
by lp_benchmark_robot＠intel.com April 4, 2018

April 4, 2018

Results for project python/master, build date: 2018-04-04 03:04:31-07:00. - commit: c51d8c9 - previous commit: 629338f - revision date: 2018-04-03 23:06:53-07:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.138% | -0.150% | +8.021% | +8.187% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.651% | -0.059% | +24.801% | +12.228% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 2.114% | -0.349% | +26.073% | +11.206% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 1.801% | -0.568% | +23.244% | +12.946% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.681% | +0.468% | +9.735% | +14.532% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.389% | -0.066% | +12.939% | +11.683% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.756% | +0.026% | +7.231% | +9.732% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.627% | +0.265% | -1.317% | +9.148% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.480% | -0.116% | +11.391% | +16.702% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.436% | -0.197% | +14.310% | +17.232% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.035% | +0.361% | +5.836% | +7.149% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 1.340% | -0.252% | +6.058% | +6.285% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 1.183% | -0.434% | +2.320% | +9.137% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.277% | +0.069% | +14.389% | +10.403% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.795% | -0.668% | +9.984% | +12.156% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 7.796% | -0.985% | +3.733% | +13.258% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.840% | -0.284% | +11.194% | +11.844% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.868% | -0.397% | +12.513% | +9.787% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.533% | -0.407% | +1.433% | +10.684% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 1.516% | +1.500% | -2.303% | +14.620% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.491% | -0.728% | +18.601% | +11.847% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.568% | +0.173% | +47.419% | +14.301% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.464% | +0.628% | +13.471% | +11.747% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.421% | -0.063% | +17.288% | +13.715% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 2.114% | -0.064% | +9.089% | +11.521% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 1.916% | -0.257% | +5.462% | +5.124% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.613% | +0.087% | +0.265% | -0.224% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.570% | -0.074% | +5.955% | +6.756% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.473% | -0.449% | +1.586% | +10.237% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.875% | +1.535% | +1.730% | +19.739% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.255% | +1.287% | +2.908% | +16.632% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 5.886% | -1.603% | +2.859% | +18.842% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.749% | +0.489% | +12.357% | +11.418% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.126% | +0.039% | +0.187% | +10.267% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.122% | -0.169% | +18.081% | +5.218% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.095% | -0.118% | +5.109% | +5.352% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.080% | -0.016% | +10.508% | +13.071% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.617% | -0.355% | +6.190% | +10.816% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.359% | +0.124% | -1.939% | +10.595% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.286% | +0.736% | -6.296% | +7.492% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 0.993% | -0.180% | +3.576% | +7.543% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.312% | -0.210% | +10.448% | +14.906% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 1.844% | -0.057% | -2.629% | +3.934% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 3.155% | -0.914% | +23.335% | +12.939% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.808% | +0.804% | +4.541% | +6.210% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 2.227% | -0.565% | +13.804% | +10.461% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 0.730% | +0.639% | -7.086% | +5.663% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.530% | +0.066% | +2.892% | +7.690% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.226% | +0.129% | +6.731% | +7.033% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 2.963% | +0.808% | +8.774% | +4.346% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.759% | -0.611% | -0.196% | +10.356% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 3.366% | +0.346% | +17.424% | +8.384% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.179% | +0.183% | +13.183% | +6.750% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.594% | -0.543% | +17.446% | +9.661% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 6.029% | -0.296% | +16.396% | +11.052% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 5.174% | -0.266% | +20.019% | +11.481% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.121% | +0.045% | +7.901% | +4.615% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.877% | +0.054% | +2.309% | +0.194% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 3.926% | +3.277% | +9.537% | +20.460% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 5.616% | +0.465% | -2.350% | +13.785% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 2.353% | -0.111% | +8.210% | +8.233% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.677% | -0.728% | +4.576% | +11.348% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 1.742% | +0.105% | +3.684% | +8.813% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 3.040% | -0.461% | -6.351% | +10.130% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.220% | +0.171% | +6.263% | +9.973% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/65-flat-results-for-python-master-bra… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

bpo-29922: Add more tests for error messages in 'async with'. (GH-6370)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/1487cd14bb1e04de5b98fffc5ec41c6cf6… commit: 1487cd14bb1e04de5b98fffc5ec41c6cf6b5d5f1 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T10:18:56-07:00 summary: bpo-29922: Add more tests for error messages in 'async with'. (GH-6370) Different paths are executed for normal exit and for leaving the 'async with' block with 'break', 'continue' or 'return'. (cherry picked from commit 2eeac269dd1e04a2a179384576986c3e47895ee0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/test_coroutines.py diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 769879f082c5..d0b44c44bd54 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1243,6 +1243,7 @@ class CM: def __aexit__(self, *e): return 444 + # Exit with exception async def foo(): async with CM(): 1/0 @@ -1270,19 +1271,58 @@ class CM: def __aexit__(self, *e): return 456 + # Normal exit async def foo(): nonlocal CNT async with CM(): CNT += 1 + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 1) + # Exit with 'break' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + break + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 2) + # Exit with 'continue' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + continue with self.assertRaisesRegex( TypeError, "'async with' received an object from __aexit__ " "that does not implement __await__: int"): run_async(foo()) + self.assertEqual(CNT, 3) - self.assertEqual(CNT, 1) + # Exit with 'return' + async def foo(): + nonlocal CNT + async with CM(): + CNT += 1 + return + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 4) def test_with_9(self):

1 0

Call super in Generic.__init_subclass__ (GH-6356)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/bd85c9738296cf4a53859ed17e9a6812d2… commit: bd85c9738296cf4a53859ed17e9a6812d2071a21 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T09:51:34-07:00 summary: Call super in Generic.__init_subclass__ (GH-6356) (cherry picked from commit ee566fe526f3d069aa313578ee81ca6cbc25ff52) Co-authored-by: Ivan Levkivskyi <levkivskyi(a)gmail.com> files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 09e39fec45e4..b12e5ea2fb80 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -1232,6 +1232,25 @@ class B(Generic[S]): ... class C(List[int], B): ... self.assertEqual(C.__mro__, (C, list, B, Generic, object)) + def test_init_subclass_super_called(self): + class FinalException(Exception): + pass + + class Final: + def __init_subclass__(cls, **kwargs) -> None: + for base in cls.__bases__: + if base is not Final and issubclass(base, Final): + raise FinalException(base) + super().__init_subclass__(**kwargs) + class Test(Generic[T], Final): + pass + with self.assertRaises(FinalException): + class Subclass(Test): + pass + with self.assertRaises(FinalException): + class Subclass(Test[int]): + pass + def test_nested(self): G = Generic diff --git a/Lib/typing.py b/Lib/typing.py index 510574c413e3..3ac3b9382262 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -850,6 +850,7 @@ def __class_getitem__(cls, params): return _GenericAlias(cls, params) def __init_subclass__(cls, *args, **kwargs): + super().__init_subclass__(*args, **kwargs) tvars = [] if '__orig_bases__' in cls.__dict__: error = Generic in cls.__orig_bases__

1 0

bpo-29922: Add more tests for error messages in 'async with'. (GH-6370)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/785f36c876721c12f653371e9893527a25… commit: 785f36c876721c12f653371e9893527a25140624 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T09:28:46-07:00 summary: bpo-29922: Add more tests for error messages in 'async with'. (GH-6370) Different paths are executed for normal exit and for leaving the 'async with' block with 'break', 'continue' or 'return'. (cherry picked from commit 2eeac269dd1e04a2a179384576986c3e47895ee0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/test_coroutines.py diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 429de489ad1d..ea54bca0df0d 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1269,6 +1269,7 @@ class CM: def __aexit__(self, *e): return 444 + # Exit with exception async def foo(): async with CM(): 1/0 @@ -1296,19 +1297,58 @@ class CM: def __aexit__(self, *e): return 456 + # Normal exit async def foo(): nonlocal CNT async with CM(): CNT += 1 + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 1) + # Exit with 'break' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + break + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 2) + # Exit with 'continue' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + continue with self.assertRaisesRegex( TypeError, "'async with' received an object from __aexit__ " "that does not implement __await__: int"): run_async(foo()) + self.assertEqual(CNT, 3) - self.assertEqual(CNT, 1) + # Exit with 'return' + async def foo(): + nonlocal CNT + async with CM(): + CNT += 1 + return + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 4) def test_with_9(self):

1 0

Call super in Generic.__init_subclass__ (#6356)
by Ivan Levkivskyi April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/ee566fe526f3d069aa313578ee81ca6cbc… commit: ee566fe526f3d069aa313578ee81ca6cbc25ff52 branch: master author: Ivan Levkivskyi <levkivskyi(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T17:00:15+01:00 summary: Call super in Generic.__init_subclass__ (#6356) files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 09e39fec45e4..b12e5ea2fb80 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -1232,6 +1232,25 @@ class B(Generic[S]): ... class C(List[int], B): ... self.assertEqual(C.__mro__, (C, list, B, Generic, object)) + def test_init_subclass_super_called(self): + class FinalException(Exception): + pass + + class Final: + def __init_subclass__(cls, **kwargs) -> None: + for base in cls.__bases__: + if base is not Final and issubclass(base, Final): + raise FinalException(base) + super().__init_subclass__(**kwargs) + class Test(Generic[T], Final): + pass + with self.assertRaises(FinalException): + class Subclass(Test): + pass + with self.assertRaises(FinalException): + class Subclass(Test[int]): + pass + def test_nested(self): G = Generic diff --git a/Lib/typing.py b/Lib/typing.py index 510574c413e3..3ac3b9382262 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -850,6 +850,7 @@ def __class_getitem__(cls, params): return _GenericAlias(cls, params) def __init_subclass__(cls, *args, **kwargs): + super().__init_subclass__(*args, **kwargs) tvars = [] if '__orig_bases__' in cls.__dict__: error = Generic in cls.__orig_bases__

1 0

bpo-29922: Add more tests for error messages in 'async with'. (GH-6370)
by Serhiy Storchaka April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/2eeac269dd1e04a2a179384576986c3e47… commit: 2eeac269dd1e04a2a179384576986c3e47895ee0 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T18:45:10+03:00 summary: bpo-29922: Add more tests for error messages in 'async with'. (GH-6370) Different paths are executed for normal exit and for leaving the 'async with' block with 'break', 'continue' or 'return'. files: M Lib/test/test_coroutines.py diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 9ad7ff9564bc..10f7cca50473 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1269,6 +1269,7 @@ class CM: def __aexit__(self, *e): return 444 + # Exit with exception async def foo(): async with CM(): 1/0 @@ -1296,19 +1297,58 @@ class CM: def __aexit__(self, *e): return 456 + # Normal exit async def foo(): nonlocal CNT async with CM(): CNT += 1 + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 1) + # Exit with 'break' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + break + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 2) + # Exit with 'continue' + async def foo(): + nonlocal CNT + for i in range(2): + async with CM(): + CNT += 1 + continue with self.assertRaisesRegex( TypeError, "'async with' received an object from __aexit__ " "that does not implement __await__: int"): run_async(foo()) + self.assertEqual(CNT, 3) - self.assertEqual(CNT, 1) + # Exit with 'return' + async def foo(): + nonlocal CNT + async with CM(): + CNT += 1 + return + with self.assertRaisesRegex( + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): + run_async(foo()) + self.assertEqual(CNT, 4) def test_with_9(self):

1 0