Mailman 3 October 2017 - Python-checkins

bpo-31877: Add _Py_LegacyLocaleDetected and _PyCoerceLegacyLocale to pylifecycle.h (GH-4134)
by Nick Coghlan Oct. 27, 2017

Oct. 27, 2017

https://github.com/python/cpython/commit/031c4bfadb69feeda82ce886d6b0cadc63… commit: 031c4bfadb69feeda82ce886d6b0cadc638d2e1e branch: master author: Erik Bray <erik.m.bray(a)gmail.com> committer: Nick Coghlan <ncoghlan(a)gmail.com> date: 2017-10-27T19:46:03+10:00 summary: bpo-31877: Add _Py_LegacyLocaleDetected and _PyCoerceLegacyLocale to pylifecycle.h (GH-4134) Only declaring these as interns inside the CLI's main C module caused build problems on some platforms (notably Cygwin), so this switches them to a regular underscore prefixed "private" C API declaration. files: M Include/pylifecycle.h M Programs/python.c diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index e1737b5972b..8bbce7fd61d 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -133,6 +133,12 @@ PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size); PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size); #endif /* !Py_LIMITED_API */ +/* Legacy locale support */ +#ifndef Py_LIMITED_API +PyAPI_FUNC(void) _Py_CoerceLegacyLocale(void); +PyAPI_FUNC(int) _Py_LegacyLocaleDetected(void); +#endif + #ifdef __cplusplus } #endif diff --git a/Programs/python.c b/Programs/python.c index 03f8295045c..4f6b9198c85 100644 --- a/Programs/python.c +++ b/Programs/python.c @@ -15,20 +15,6 @@ wmain(int argc, wchar_t **argv) } #else -/* Access private pylifecycle helper API to better handle the legacy C locale - * - * The legacy C locale assumes ASCII as the default text encoding, which - * causes problems not only for the CPython runtime, but also other - * components like GNU readline. - * - * Accordingly, when the CLI detects it, it attempts to coerce it to a - * more capable UTF-8 based alternative. - * - * See the documentation of the PYTHONCOERCECLOCALE setting for more details. - * - */ -extern int _Py_LegacyLocaleDetected(void); -extern void _Py_CoerceLegacyLocale(void); int main(int argc, char **argv) @@ -78,6 +64,16 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); #endif + /* The legacy C locale assumes ASCII as the default text encoding, which + * causes problems not only for the CPython runtime, but also other + * components like GNU readline. + * + * Accordingly, when the CLI detects it, it attempts to coerce it to a + * more capable UTF-8 based alternative. + * + * See the documentation of the PYTHONCOERCECLOCALE setting for more + * details. + */ if (_Py_LegacyLocaleDetected()) { _Py_CoerceLegacyLocale(); }

1 0

Daily reference leaks (4243df51fe43): sum=69
by solipsis＠pitrou.net Oct. 27, 2017

Oct. 27, 2017

results for 4243df51fe43 on branch "default" -------------------------------------------- test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_spawn leaked [0, 44, 0] references, sum=44 test_multiprocessing_spawn leaked [0, 21, -2] memory blocks, sum=19 test_multiprocessing_spawn leaked [0, 2, 0] file descriptors, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogJKgap3', '--timeout', '7200']

1 0

Fixed sorting order of the LogRecord attributes in the documentation. (GH-4133)
by Vinay Sajip Oct. 27, 2017

Oct. 27, 2017

https://github.com/python/cpython/commit/2f3d6993d7ca4a4d218e0d63b126c94bc0… commit: 2f3d6993d7ca4a4d218e0d63b126c94bc00a03b8 branch: master author: Arthur Darcet <arthur+github(a)darcet.fr> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2017-10-27T08:06:20+01:00 summary: Fixed sorting order of the LogRecord attributes in the documentation. (GH-4133) files: M Doc/library/logging.rst diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index d2c6c90c41c..148f131cac5 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -779,15 +779,15 @@ the options available to you. | lineno | ``%(lineno)d`` | Source line number where the logging call was | | | | issued (if available). | +----------------+-------------------------+-----------------------------------------------+ +| message | ``%(message)s`` | The logged message, computed as ``msg % | +| | | args``. This is set when | +| | | :meth:`Formatter.format` is invoked. | ++----------------+-------------------------+-----------------------------------------------+ | module | ``%(module)s`` | Module (name portion of ``filename``). | +----------------+-------------------------+-----------------------------------------------+ | msecs | ``%(msecs)d`` | Millisecond portion of the time when the | | | | :class:`LogRecord` was created. | +----------------+-------------------------+-----------------------------------------------+ -| message | ``%(message)s`` | The logged message, computed as ``msg % | -| | | args``. This is set when | -| | | :meth:`Formatter.format` is invoked. | -+----------------+-------------------------+-----------------------------------------------+ | msg | You shouldn't need to | The format string passed in the original | | | format this yourself. | logging call. Merged with ``args`` to | | | | produce ``message``, or an arbitrary object |

1 0

bpo-30989: Sort in TimedRotatingFileHandler only when needed. (GH-2812)
by Vinay Sajip Oct. 27, 2017

Oct. 27, 2017

https://github.com/python/cpython/commit/afad147b59fe84b12317f7340ddd2deeec… commit: afad147b59fe84b12317f7340ddd2deeecb22321 branch: master author: Lovesh Harchandani <lovesh(a)users.noreply.github.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2017-10-27T08:04:33+01:00 summary: bpo-30989: Sort in TimedRotatingFileHandler only when needed. (GH-2812) TimedRotatingFileHandler.getFilesToDelete() now sorts only when needed. files: M Lib/logging/handlers.py diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index a815f033e60..d1871acfa4b 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -353,10 +353,10 @@ def getFilesToDelete(self): suffix = fileName[plen:] if self.extMatch.match(suffix): result.append(os.path.join(dirName, fileName)) - result.sort() if len(result) < self.backupCount: result = [] else: + result.sort() result = result[:len(result) - self.backupCount] return result

1 0

bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907)
by Berker Peksag Oct. 27, 2017

Oct. 27, 2017

https://github.com/python/cpython/commit/37d1d967eed4018ef397dd9d1515683e5b… commit: 37d1d967eed4018ef397dd9d1515683e5b6b55e7 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2017-10-27T07:47:00+03:00 summary: bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907) (cherry picked from commit d609b0c24ebdb748cabcc6c062dfc86f9000e6c4) files: M Doc/using/venv-create.inc diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index 53f431b5cfd..4292592ba7a 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -33,7 +33,7 @@ On Windows, invoke the ``venv`` command as follows:: Alternatively, if you configured the ``PATH`` and ``PATHEXT`` variables for your :ref:`Python installation <using-on-windows>`:: - c:\>python -m venv myenv c:\path\to\myenv + c:\>python -m venv c:\path\to\myenv The command, if run with ``-h``, will show the available options::

1 0

bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907)
by Berker Peksag Oct. 27, 2017

Oct. 27, 2017

https://github.com/python/cpython/commit/d609b0c24ebdb748cabcc6c062dfc86f90… commit: d609b0c24ebdb748cabcc6c062dfc86f9000e6c4 branch: master author: cocoatomo <cocoatomo77(a)gmail.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2017-10-27T07:42:11+03:00 summary: bpo-31053: Remove redundant 'venv' argument in venv example (GH-2907) files: M Doc/using/venv-create.inc diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index 53f431b5cfd..4292592ba7a 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -33,7 +33,7 @@ On Windows, invoke the ``venv`` command as follows:: Alternatively, if you configured the ``PATH`` and ``PATHEXT`` variables for your :ref:`Python installation <using-on-windows>`:: - c:\>python -m venv myenv c:\path\to\myenv + c:\>python -m venv c:\path\to\myenv The command, if run with ``-h``, will show the available options::

1 0

[1 up, 64 flat] Results for Python (master branch) 2017-10-26
by lp_benchmark_robot＠intel.com Oct. 26, 2017

Oct. 26, 2017

Results for project python/master, build date: 2017-10-26 03:02:48-07:00. - commit: 275d2d9 - previous commit: 95f1a7b - revision date: 2017-10-26 11:27:46+03: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| 0.985% | +0.604% | +6.274% | +6.355% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 1.044% | +0.417% | +21.406% | +12.825% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 1.030% | +0.403% | +22.242% | +12.730% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.369% | -0.391% | +20.473% | +12.576% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.930% | -1.694% | +8.040% | +9.356% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 2.232% | +0.081% | +11.087% | +9.713% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.772% | +0.672% | +8.107% | +9.180% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.803% | +0.407% | +3.845% | +5.509% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.468% | +1.614% | +7.420% | +19.712% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 3.921% | +1.665% | +10.758% | +12.048% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.244% | +0.060% | +5.198% | +5.931% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.661% | +1.072% | +5.811% | +4.796% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.609% | +1.515% | +4.677% | +4.867% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.695% | -0.466% | +13.073% | +7.749% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.175% | +0.204% | +9.393% | +8.904% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.805% | +0.611% | +6.586% | +10.766% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.493% | +0.663% | +11.153% | +9.877% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.491% | -1.418% | +9.645% | +8.552% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.806% | +0.395% | +3.693% | +7.690% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 1.111% | +1.553% | +1.710% | +9.429% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.770% | -0.101% | +9.835% | +11.178% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 3.016% | +1.353% | +47.887% | +10.983% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.954% | -1.543% | +9.284% | +12.962% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.551% | +0.305% | +17.530% | +11.857% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 1.929% | -0.276% | +8.827% | +10.131% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.340% | -0.184% | +3.632% | +6.247% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.983% | -0.857% | -0.752% | +1.852% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.714% | +1.247% | +6.877% | +6.624% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.609% | -0.868% | +6.541% | +7.741% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.949% | +1.019% | -0.877% | +22.593% | +-----+------------------------+--------+------------+------------+------------+ | :-) | pickle_dict| 0.489% | +1.987% | +1.706% | +19.084% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.719% | +0.318% | +5.111% | +14.942% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 4.934% | -0.538% | +11.343% | +9.127% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.153% | +0.253% | +0.397% | +9.880% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.125% | +0.123% | +11.344% | +4.526% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.089% | +0.154% | +2.695% | +4.525% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.434% | -0.599% | +10.546% | +12.793% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 6.048% | -2.741% | +0.945% | +8.961% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.570% | +1.594% | +0.397% | +9.780% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 1.362% | -0.364% | -1.339% | +0.184% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 2.105% | +0.578% | +6.448% | +6.089% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.555% | -0.377% | +8.574% | +15.428% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.555% | -0.231% | -0.064% | +3.003% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.523% | +0.608% | +27.797% | +5.640% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.645% | +0.758% | +6.067% | +4.020% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.476% | +1.506% | +15.483% | +6.014% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 0.743% | +0.159% | +2.754% | -4.040% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.504% | +1.724% | +6.821% | +2.374% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.186% | -0.367% | +6.755% | +6.250% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.293% | -1.218% | +6.421% | +4.663% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 5.665% | -1.875% | +17.804% | +10.006% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.591% | -1.388% | +10.432% | +8.417% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.767% | +0.055% | +9.680% | +6.576% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 5.013% | -1.284% | +9.644% | +10.024% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 5.485% | -1.565% | +10.804% | +9.535% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.018% | +0.757% | +23.473% | +9.306% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.210% | -0.584% | +6.145% | +6.881% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.935% | +0.552% | +2.653% | -1.657% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 3.802% | +0.461% | +11.112% | +17.460% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.161% | +1.375% | +3.004% | +18.262% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 1.598% | +0.563% | +8.259% | +5.708% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 0.791% | +0.177% | +6.898% | +7.071% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.368% | +0.015% | +3.838% | +7.172% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.149% | -0.258% | -5.540% | +12.424% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 0.942% | +0.370% | +7.887% | +8.274% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/1-up-64-flat-results-for-python-maste… 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-28936: Detect lexically first syntax error first (#4097)
by Serhiy Storchaka Oct. 26, 2017

Oct. 26, 2017

https://github.com/python/cpython/commit/8c83c23fa32405aa9212f028d234f4129d… commit: 8c83c23fa32405aa9212f028d234f4129d105a23 branch: master author: Ivan Levkivskyi <levkivskyi(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-10-27T00:28:35+03:00 summary: bpo-28936: Detect lexically first syntax error first (#4097) Lexically first global and nonlocal syntax errors at given scope should be detected first. files: A Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst M Lib/test/test_syntax.py M Python/symtable.c diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 7ce3d75a892..5d36581859b 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -400,12 +400,25 @@ Misuse of the nonlocal and global statement can lead to a few unique syntax errors. >>> def f(): + ... print(x) + ... global x + Traceback (most recent call last): + ... + SyntaxError: name 'x' is used prior to global declaration + + >>> def f(): ... x = 1 ... global x Traceback (most recent call last): ... SyntaxError: name 'x' is assigned to before global declaration + >>> def f(x): + ... global x + Traceback (most recent call last): + ... + SyntaxError: name 'x' is parameter and global + >>> def f(): ... x = 1 ... def g(): @@ -560,7 +573,6 @@ import re import unittest -import warnings from test import support @@ -596,19 +608,25 @@ def test_assign_call(self): def test_assign_del(self): self._check_error("del f()", "delete") - def test_global_err_then_warn(self): - # Bug #763201: The SyntaxError raised for one global statement - # shouldn't be clobbered by a SyntaxWarning issued for a later one. + def test_global_param_err_first(self): source = """if 1: def error(a): global a # SyntaxError - def warning(): + def error2(): + b = 1 + global b # SyntaxError + """ + self._check_error(source, "parameter and global", lineno=3) + + def test_nonlocal_param_err_first(self): + source = """if 1: + def error(a): + nonlocal a # SyntaxError + def error2(): b = 1 - global b # SyntaxWarning + global b # SyntaxError """ - warnings.filterwarnings(action='ignore', category=SyntaxWarning) - self._check_error(source, "global") - warnings.filters.pop(0) + self._check_error(source, "parameter and nonlocal", lineno=3) def test_break_outside_loop(self): self._check_error("break", "outside loop") diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst b/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst new file mode 100644 index 00000000000..8ebdf32e5be --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-10-23-23-39-26.bpo-28936.C288Jh.rst @@ -0,0 +1,2 @@ +Ensure that lexically first syntax error involving a parameter and ``global`` +or ``nonlocal`` is detected first at a given scope. Patch by Ivan Levkivskyi. diff --git a/Python/symtable.c b/Python/symtable.c index 2658b917d7a..55815c91cc9 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -9,6 +9,12 @@ #include "structmember.h" /* error strings used for warnings */ +#define GLOBAL_PARAM \ +"name '%U' is parameter and global" + +#define NONLOCAL_PARAM \ +"name '%U' is parameter and nonlocal" + #define GLOBAL_AFTER_ASSIGN \ "name '%U' is assigned to before global declaration" @@ -465,12 +471,6 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags, PyObject *global) { if (flags & DEF_GLOBAL) { - if (flags & DEF_PARAM) { - PyErr_Format(PyExc_SyntaxError, - "name '%U' is parameter and global", - name); - return error_at_directive(ste, name); - } if (flags & DEF_NONLOCAL) { PyErr_Format(PyExc_SyntaxError, "name '%U' is nonlocal and global", @@ -485,12 +485,6 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags, return 1; } if (flags & DEF_NONLOCAL) { - if (flags & DEF_PARAM) { - PyErr_Format(PyExc_SyntaxError, - "name '%U' is parameter and nonlocal", - name); - return error_at_directive(ste, name); - } if (!bound) { PyErr_Format(PyExc_SyntaxError, "nonlocal declaration not allowed at module level"); @@ -1284,9 +1278,11 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) long cur = symtable_lookup(st, name); if (cur < 0) VISIT_QUIT(st, 0); - if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { - char* msg; - if (cur & USE) { + if (cur & (DEF_PARAM | DEF_LOCAL | USE | DEF_ANNOT)) { + const char* msg; + if (cur & DEF_PARAM) { + msg = GLOBAL_PARAM; + } else if (cur & USE) { msg = GLOBAL_AFTER_USE; } else if (cur & DEF_ANNOT) { msg = GLOBAL_ANNOT; @@ -1315,9 +1311,11 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s) long cur = symtable_lookup(st, name); if (cur < 0) VISIT_QUIT(st, 0); - if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) { - char* msg; - if (cur & USE) { + if (cur & (DEF_PARAM | DEF_LOCAL | USE | DEF_ANNOT)) { + const char* msg; + if (cur & DEF_PARAM) { + msg = NONLOCAL_PARAM; + } else if (cur & USE) { msg = NONLOCAL_AFTER_USE; } else if (cur & DEF_ANNOT) { msg = NONLOCAL_ANNOT;

1 0

Closes bpo-28281: Remove year (1-9999) limits on the weekday() function. (#4109)
by Alexander Belopolsky Oct. 26, 2017

Oct. 26, 2017

https://github.com/python/cpython/commit/66c88ce30ca2b23daa37038e1a3c0de98f… commit: 66c88ce30ca2b23daa37038e1a3c0de98f241f50 branch: master author: Alexander Belopolsky <abalkin(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-10-26T15:34:11-04:00 summary: Closes bpo-28281: Remove year (1-9999) limits on the weekday() function. (#4109) Patch by Mark Gollahon. files: A Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst M Doc/library/calendar.rst M Lib/calendar.py M Lib/test/test_calendar.py M Misc/ACKS diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst index 8fe93fd4de3..56b75ef0f85 100644 --- a/Doc/library/calendar.rst +++ b/Doc/library/calendar.rst @@ -19,11 +19,13 @@ the week to Sunday (6) or to any other weekday. Parameters that specify dates are given as integers. For related functionality, see also the :mod:`datetime` and :mod:`time` modules. -Most of these functions and classes rely on the :mod:`datetime` module which -uses an idealized calendar, the current Gregorian calendar extended +The functions and classes defined in this module +use an idealized calendar, the current Gregorian calendar extended indefinitely in both directions. This matches the definition of the "proleptic Gregorian" calendar in Dershowitz and Reingold's book "Calendrical Calculations", where -it's the base calendar for all computations. +it's the base calendar for all computations. Zero and negative years are +interpreted as prescribed by the ISO 8601 standard. Year 0 is 1 BC, year -1 is +2 BC, and so on. .. class:: Calendar(firstweekday=0) diff --git a/Lib/calendar.py b/Lib/calendar.py index fb594e0f5b0..3828c43ed27 100644 --- a/Lib/calendar.py +++ b/Lib/calendar.py @@ -111,8 +111,9 @@ def leapdays(y1, y2): def weekday(year, month, day): - """Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12), - day (1-31).""" + """Return weekday (0-6 ~ Mon-Sun) for year, month (1-12), day (1-31).""" + if not datetime.MINYEAR <= year <= datetime.MAXYEAR: + year = 2000 + year % 400 return datetime.date(year, month, day).weekday() diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index ad8b6bb6b93..6241d114d33 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -9,6 +9,56 @@ import datetime import os +# From https://en.wikipedia.org/wiki/Leap_year_starting_on_Saturday +result_0_02_text = """\ + February 0 +Mo Tu We Th Fr Sa Su + 1 2 3 4 5 6 + 7 8 9 10 11 12 13 +14 15 16 17 18 19 20 +21 22 23 24 25 26 27 +28 29 +""" + +result_0_text = """\ + 0 + + January February March +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 1 2 1 2 3 4 5 6 1 2 3 4 5 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 6 7 8 9 10 11 12 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 13 14 15 16 17 18 19 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 20 21 22 23 24 25 26 +24 25 26 27 28 29 30 28 29 27 28 29 30 31 +31 + + April May June +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 1 2 1 2 3 4 5 6 7 1 2 3 4 + 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 29 30 31 26 27 28 29 30 + + July August September +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 1 2 1 2 3 4 5 6 1 2 3 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 4 5 6 7 8 9 10 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +24 25 26 27 28 29 30 28 29 30 31 25 26 27 28 29 30 +31 + + October November December +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 +""" + result_2004_01_text = """\ January 2004 Mo Tu We Th Fr Sa Su @@ -343,12 +393,20 @@ def test_output(self): self.normalize_calendar(calendar.calendar(2004)), self.normalize_calendar(result_2004_text) ) + self.assertEqual( + self.normalize_calendar(calendar.calendar(0)), + self.normalize_calendar(result_0_text) + ) def test_output_textcalendar(self): self.assertEqual( calendar.TextCalendar().formatyear(2004), result_2004_text ) + self.assertEqual( + calendar.TextCalendar().formatyear(0), + result_0_text + ) def test_output_htmlcalendar_encoding_ascii(self): self.check_htmlcalendar_encoding('ascii', 'ascii') @@ -393,6 +451,10 @@ def test_formatmonth(self): calendar.TextCalendar().formatmonth(2004, 1), result_2004_01_text ) + self.assertEqual( + calendar.TextCalendar().formatmonth(0, 2), + result_0_02_text + ) def test_formatmonthname_with_year(self): self.assertEqual( diff --git a/Misc/ACKS b/Misc/ACKS index 7b174c63535..ac7a258df18 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -545,6 +545,7 @@ Karan Goel Jeroen Van Goey Christoph Gohlke Tim Golden +Mark Gollahon Guilherme Gonçalves Tiago Gonçalves Chris Gonnerman diff --git a/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst b/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst new file mode 100644 index 00000000000..e7681dd4e8f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-26-14-54-38.bpo-28281.7ZN5FG.rst @@ -0,0 +1,3 @@ +Remove year (1-9999) limits on the Calendar.weekday() function. + +Patch by Mark Gollahon.

1 0

bpo-30553: Add status code 421 to http.HTTPStatus (GH-2589)
by Berker Peksag Oct. 26, 2017

Oct. 26, 2017

https://github.com/python/cpython/commit/52ad72dd0a5a56414cc29b7c9b03259169… commit: 52ad72dd0a5a56414cc29b7c9b03259169825f35 branch: master author: Vitor Pereira <vmsousapereira(a)gmail.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2017-10-26T21:49:19+03:00 summary: bpo-30553: Add status code 421 to http.HTTPStatus (GH-2589) files: A Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst M Doc/library/http.rst M Lib/http/__init__.py M Lib/test/test_httplib.py diff --git a/Doc/library/http.rst b/Doc/library/http.rst index be661c5e8c2..7c34004a3ae 100644 --- a/Doc/library/http.rst +++ b/Doc/library/http.rst @@ -98,6 +98,7 @@ Code Enum Name Details ``415`` ``UNSUPPORTED_MEDIA_TYPE`` HTTP/1.1 :rfc:`7231`, Section 6.5.13 ``416`` ``REQUEST_RANGE_NOT_SATISFIABLE`` HTTP/1.1 Range Requests :rfc:`7233`, Section 4.4 ``417`` ``EXPECTATION_FAILED`` HTTP/1.1 :rfc:`7231`, Section 6.5.14 +``421`` ``MISDIRECTED_REQUEST`` HTTP/2 :rfc:`7540`, Section 9.1.2 ``422`` ``UNPROCESSABLE_ENTITY`` WebDAV :rfc:`4918`, Section 11.2 ``423`` ``LOCKED`` WebDAV :rfc:`4918`, Section 11.3 ``424`` ``FAILED_DEPENDENCY`` WebDAV :rfc:`4918`, Section 11.4 @@ -122,3 +123,6 @@ In order to preserve backwards compatibility, enum values are also present in the :mod:`http.client` module in the form of constants. The enum name is equal to the constant name (i.e. ``http.HTTPStatus.OK`` is also available as ``http.client.OK``). + +.. versionchanged:: 3.7 + Added ``421 MISDIRECTED_REQUEST`` status code. diff --git a/Lib/http/__init__.py b/Lib/http/__init__.py index d4334cc88f9..aed94a58504 100644 --- a/Lib/http/__init__.py +++ b/Lib/http/__init__.py @@ -15,6 +15,7 @@ class HTTPStatus(IntEnum): * RFC 7238: Permanent Redirect * RFC 2295: Transparent Content Negotiation in HTTP * RFC 2774: An HTTP Extension Framework + * RFC 7540: Hypertext Transfer Protocol Version 2 (HTTP/2) """ def __new__(cls, value, phrase, description=''): obj = int.__new__(cls, value) @@ -98,6 +99,8 @@ def __new__(cls, value, phrase, description=''): 'Cannot satisfy request range') EXPECTATION_FAILED = (417, 'Expectation Failed', 'Expect condition could not be satisfied') + MISDIRECTED_REQUEST = (421, 'Misdirected Request', + 'Server is not able to produce a response') UNPROCESSABLE_ENTITY = 422, 'Unprocessable Entity' LOCKED = 423, 'Locked' FAILED_DEPENDENCY = 424, 'Failed Dependency' diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index bec994ed293..5591f1d9e3d 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -1354,6 +1354,7 @@ def test_client_constants(self): 'UNSUPPORTED_MEDIA_TYPE', 'REQUESTED_RANGE_NOT_SATISFIABLE', 'EXPECTATION_FAILED', + 'MISDIRECTED_REQUEST', 'UNPROCESSABLE_ENTITY', 'LOCKED', 'FAILED_DEPENDENCY', diff --git a/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst b/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst new file mode 100644 index 00000000000..51f0d5b9922 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-07-05-14-48-26.bpo-30553.Oupsxo.rst @@ -0,0 +1,2 @@ +Add HTTP/2 status code 421 (Misdirected Request) to +:class:`http.HTTPStatus`. Patch by Vitor Pereira.

1 0