Mailman 3 April 2018 - Python-checkins

bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341)
by INADA Naoki April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/d1c82c5cc7be0c21dddf86fd19c1702f62… commit: d1c82c5cc7be0c21dddf86fd19c1702f6218459b branch: master author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T11:43:53+09:00 summary: bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341) files: A Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst M Objects/dictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst new file mode 100644 index 000000000000..22abf8d00011 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst @@ -0,0 +1,2 @@ +Fix ``ma_version_tag`` in dict implementation is uninitialized when copying +from key-sharing dict. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index bb4ea1f5f9c5..be895d4c1524 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2551,6 +2551,7 @@ PyDict_Copy(PyObject *o) split_copy->ma_values = newvalues; split_copy->ma_keys = mp->ma_keys; split_copy->ma_used = mp->ma_used; + split_copy->ma_version_tag = DICT_NEXT_VERSION(); DK_INCREF(mp->ma_keys); for (i = 0, n = size; i < n; i++) { PyObject *value = mp->ma_values[i];

1 0

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

April 3, 2018

Results for project python/master, build date: 2018-04-02 03:04:32-07:00. - commit: da58533 - previous commit: 233de02 - revision date: 2018-04-02 01:47:46-04: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.158% | -0.750% | +8.279% | +7.852% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 1.078% | +0.696% | +25.832% | +10.867% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 4.330% | +0.174% | +25.342% | +8.950% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 1.379% | +0.236% | +24.731% | +8.064% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 4.604% | +0.790% | +9.467% | +15.487% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.769% | -1.154% | +9.751% | +13.029% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.995% | -0.257% | +6.894% | +11.346% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.423% | -1.036% | -0.454% | +9.396% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.440% | -1.691% | +12.087% | +16.702% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.267% | +0.875% | +13.465% | +16.013% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.117% | +0.974% | +5.257% | +6.179% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.517% | -0.776% | +6.360% | +4.626% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 1.112% | -0.074% | +3.705% | +5.923% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 0.978% | +0.610% | +13.737% | +11.628% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.833% | +1.129% | +10.712% | +11.353% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 7.392% | +0.312% | +4.202% | +11.550% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.554% | +0.235% | +11.892% | +11.546% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.515% | -0.641% | +11.539% | +11.078% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.059% | +0.750% | +2.208% | +10.952% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 3.704% | +0.058% | -0.143% | +13.572% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.573% | -0.209% | +18.590% | +12.650% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 6.159% | -0.463% | +47.720% | +13.923% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.486% | +0.110% | +13.484% | +13.148% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.568% | -1.542% | +15.843% | +15.730% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 2.322% | -0.510% | +8.621% | +10.859% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 0.925% | +0.065% | +4.710% | +7.219% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 1.394% | -0.009% | -2.796% | +4.574% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.746% | -0.805% | +5.098% | +7.201% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.426% | -1.116% | +0.814% | +12.023% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.479% | -0.509% | +1.306% | +18.372% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.140% | -0.023% | +0.910% | +19.168% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.722% | -0.310% | +4.888% | +18.137% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 4.359% | +0.080% | +11.853% | +12.227% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.224% | -0.030% | +0.204% | +9.685% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.129% | +0.045% | +18.138% | +5.220% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.084% | +0.031% | +5.092% | +5.493% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.262% | -0.682% | +10.129% | +13.781% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.905% | +0.581% | +5.942% | +10.672% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.613% | +2.106% | -0.378% | +8.624% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 1.529% | +4.671% | -3.300% | +3.664% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.403% | +0.752% | +3.872% | +6.433% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.134% | +0.294% | +10.542% | +14.338% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.386% | -1.256% | -1.872% | +5.346% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 2.433% | -1.301% | +23.408% | +13.272% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 1.905% | -0.159% | +4.242% | +6.703% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 1.217% | -0.470% | +14.692% | +9.687% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 1.191% | -1.736% | -4.832% | -1.887% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.460% | -0.836% | +4.552% | +5.466% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.212% | -0.855% | +6.431% | +6.701% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.226% | +0.608% | +7.207% | +5.229% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 2.556% | +1.252% | +1.657% | +9.717% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 3.093% | -0.338% | +16.777% | +7.927% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.256% | +0.111% | +12.825% | +6.389% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.078% | +0.789% | +17.727% | +8.466% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 5.807% | +1.610% | +16.223% | +9.360% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.209% | +0.048% | +20.966% | +8.680% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 0.847% | +0.249% | +7.348% | +5.853% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.807% | -0.014% | +2.118% | +0.202% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 4.063% | +0.772% | +10.076% | +21.102% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.214% | +1.285% | -0.527% | +13.804% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 1.836% | -0.103% | +8.257% | +7.232% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 0.933% | +0.347% | +4.768% | +10.579% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.200% | +0.803% | +2.054% | +10.094% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 3.810% | -0.733% | -8.777% | +13.275% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.110% | +0.078% | +6.160% | +10.771% | +-----+------------------------+--------+------------+------------+------------+ * 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: Improve error messages in 'async with' (GH-6352)
by Serhiy Storchaka April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/a68f2f0578bbf812fa2264d0e0bb388340… commit: a68f2f0578bbf812fa2264d0e0bb388340d6e230 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T01:41:38+03:00 summary: bpo-29922: Improve error messages in 'async with' (GH-6352) when __aenter__() or __aexit__() return non-awaitable object. files: A Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst M Lib/test/test_coroutines.py M Python/ceval.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index fe26199f95af..9ad7ff9564bc 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1255,7 +1255,9 @@ def __aexit__(self, *e): pass with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): + TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: int"): # it's important that __aexit__ wasn't called run_async(foo()) @@ -1275,7 +1277,9 @@ def __aexit__(self, *e): run_async(foo()) except TypeError as exc: self.assertRegex( - exc.args[0], "object int can't be used in 'await' expression") + exc.args[0], + "'async with' received an object from __aexit__ " + "that does not implement __await__: int") self.assertTrue(exc.__context__ is not None) self.assertTrue(isinstance(exc.__context__, ZeroDivisionError)) else: @@ -1299,8 +1303,9 @@ def __aexit__(self, *e): with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): - + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): run_async(foo()) self.assertEqual(CNT, 1) diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst new file mode 100644 index 000000000000..d8c144e59d6c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst @@ -0,0 +1,2 @@ +Improved error messages in 'async with' when ``__aenter__()`` or +``__aexit__()`` return non-awaitable object. diff --git a/Python/ceval.c b/Python/ceval.c index d18a284e9f9d..da83e41f5ddd 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -69,6 +69,7 @@ static PyObject * unicode_concatenate(PyObject *, PyObject *, static PyObject * special_lookup(PyObject *, _Py_Identifier *); static int check_args_iterable(PyObject *func, PyObject *vararg); static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs); +static void format_awaitable_error(PyTypeObject *, int); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" @@ -1736,6 +1737,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) PyObject *iterable = TOP(); PyObject *iter = _PyCoro_GetAwaitableIter(iterable); + if (iter == NULL) { + format_awaitable_error(Py_TYPE(iterable), + _Py_OPCODE(next_instr[-2])); + } + Py_DECREF(iterable); if (iter != NULL && PyCoro_CheckExact(iter)) { @@ -4985,6 +4991,25 @@ format_exc_unbound(PyCodeObject *co, int oparg) } } +static void +format_awaitable_error(PyTypeObject *type, int prevopcode) +{ + if (type->tp_as_async == NULL || type->tp_as_async->am_await == NULL) { + if (prevopcode == BEFORE_ASYNC_WITH) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + else if (prevopcode == WITH_CLEANUP_START) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + } +} + static PyObject * unicode_concatenate(PyObject *v, PyObject *w, PyFrameObject *f, const _Py_CODEUNIT *next_instr)

1 0

bpo-33204: IDLE - revise and extend colorizer test. (GH-6347)
by Miss Islington (bot) April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/306559e6ca15b86eb230609f484f48132b… commit: 306559e6ca15b86eb230609f484f48132b7ca383 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T09:12:56-07:00 summary: bpo-33204: IDLE - revise and extend colorizer test. (GH-6347) Followup to primary PR for the issue, GH-6344. (cherry picked from commit 55966f3a0d5f1bf823bd22ce1abbde267b06552f) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/colorizer.py M Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index f835e5874b7e..5cb85f24dfd7 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -262,9 +262,12 @@ def _color_delegator(parent): # htest # top.title("Test ColorDelegator") x, y = map(int, parent.geometry().split('+')[1:]) top.geometry("700x250+%d+%d" % (x + 20, y + 175)) - source = ("# Following has syntax errors\n" - "if True: then int 1\nelif False: print 0\nelse: float(None)\n" - "if iF + If + IF: 'keywork matching must respect case'\n" + source = ( + "if True: int ('1') # keyword, builtin, string, comment\n" + "elif False: print(0)\n" + "else: float(None)\n" + "if iF + If + IF: 'keyword matching must respect case'\n" + "if'': x or'' # valid string-keyword no-space combinations\n" "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" "r'x', u'x', R'x', U'x', f'x', F'x'\n" diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst index d5d769846eb1..3ae937bab930 100644 --- a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -1,3 +1,3 @@ IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot -be paired with either 'r' or 'f'. Consistently color as much of the prefix, -starting at the right, as is valid. +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid. Revise and extend colorizer test.

1 0

bpo-33204: IDLE - revise and extend colorizer test. (GH-6347)
by Miss Islington (bot) April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/fa91aff07c16ad48a63580c2909934be92… commit: fa91aff07c16ad48a63580c2909934be92a5e9c8 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T09:03:52-07:00 summary: bpo-33204: IDLE - revise and extend colorizer test. (GH-6347) Followup to primary PR for the issue, GH-6344. (cherry picked from commit 55966f3a0d5f1bf823bd22ce1abbde267b06552f) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/colorizer.py M Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index f835e5874b7e..5cb85f24dfd7 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -262,9 +262,12 @@ def _color_delegator(parent): # htest # top.title("Test ColorDelegator") x, y = map(int, parent.geometry().split('+')[1:]) top.geometry("700x250+%d+%d" % (x + 20, y + 175)) - source = ("# Following has syntax errors\n" - "if True: then int 1\nelif False: print 0\nelse: float(None)\n" - "if iF + If + IF: 'keywork matching must respect case'\n" + source = ( + "if True: int ('1') # keyword, builtin, string, comment\n" + "elif False: print(0)\n" + "else: float(None)\n" + "if iF + If + IF: 'keyword matching must respect case'\n" + "if'': x or'' # valid string-keyword no-space combinations\n" "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" "r'x', u'x', R'x', U'x', f'x', F'x'\n" diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst index d5d769846eb1..3ae937bab930 100644 --- a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -1,3 +1,3 @@ IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot -be paired with either 'r' or 'f'. Consistently color as much of the prefix, -starting at the right, as is valid. +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid. Revise and extend colorizer test.

1 0

bpo-33204: IDLE - revise and extend colorizer test. (GH-6347)
by Terry Jan Reedy April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/55966f3a0d5f1bf823bd22ce1abbde267b… commit: 55966f3a0d5f1bf823bd22ce1abbde267b06552f branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-04-02T11:18:02-04:00 summary: bpo-33204: IDLE - revise and extend colorizer test. (GH-6347) Followup to primary PR for the issue, GH-6344. files: M Lib/idlelib/colorizer.py M Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index f835e5874b7e..5cb85f24dfd7 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -262,9 +262,12 @@ def _color_delegator(parent): # htest # top.title("Test ColorDelegator") x, y = map(int, parent.geometry().split('+')[1:]) top.geometry("700x250+%d+%d" % (x + 20, y + 175)) - source = ("# Following has syntax errors\n" - "if True: then int 1\nelif False: print 0\nelse: float(None)\n" - "if iF + If + IF: 'keywork matching must respect case'\n" + source = ( + "if True: int ('1') # keyword, builtin, string, comment\n" + "elif False: print(0)\n" + "else: float(None)\n" + "if iF + If + IF: 'keyword matching must respect case'\n" + "if'': x or'' # valid string-keyword no-space combinations\n" "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" "r'x', u'x', R'x', U'x', f'x', F'x'\n" diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst index d5d769846eb1..3ae937bab930 100644 --- a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -1,3 +1,3 @@ IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot -be paired with either 'r' or 'f'. Consistently color as much of the prefix, -starting at the right, as is valid. +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid. Revise and extend colorizer test.

1 0

Daily reference leaks (4243df51fe43): sum=3
by solipsis＠pitrou.net April 2, 2018

April 2, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 8, 0] memory blocks, sum=1 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [0, 0, -2] memory blocks, sum=-2 test_multiprocessing_spawn leaked [-1, -1, 2] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/refloglf9oZi', '--timeout', '7200']

1 0

bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344)
by Miss Islington (bot) April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/16cf84b4fbe78f9d876e0335f33459f1b9… commit: 16cf84b4fbe78f9d876e0335f33459f1b92b7bf0 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-01T23:33:25-07:00 summary: bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344) A 'u' string prefix cannot be paired with either 'r' or 'f'. Consistently color as much of the prefix, starting at the right, as is valid. (cherry picked from commit da58533ac67b01ce8f6466e6f03ff6b8b3bb04d5) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst M Lib/idlelib/colorizer.py diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index ff4084528804..f835e5874b7e 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -21,7 +21,7 @@ def make_pat(): # 1st 'file' colorized normal, 2nd as builtin, 3rd as string builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b" comment = any("COMMENT", [r"#[^\n]*"]) - stringprefix = r"(?i:\br|u|f|fr|rf|b|br|rb)?" + stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb)?" sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?" dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?' sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" @@ -265,11 +265,14 @@ def _color_delegator(parent): # htest # source = ("# Following has syntax errors\n" "if True: then int 1\nelif False: print 0\nelse: float(None)\n" "if iF + If + IF: 'keywork matching must respect case'\n" - "# All valid prefixes for unicode and byte strings should be colored\n" + "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" - "r'x', u'x', R'x', U'x', f'x', F'x', ur'is invalid'\n" + "r'x', u'x', R'x', U'x', f'x', F'x'\n" "fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x'\n" - "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n") + "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n" + "# Invalid combinations of legal characters should be half colored.\n" + "ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x'" + ) text = Text(top, background="white") text.pack(expand=1, fill="both") text.insert("insert", source) diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst new file mode 100644 index 000000000000..d5d769846eb1 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -0,0 +1,3 @@ +IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid.

1 0

bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344)
by Miss Islington (bot) April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/6130675efeb3c23cebc43ab07c49eb62cd… commit: 6130675efeb3c23cebc43ab07c49eb62cd03cacf branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-01T23:09:18-07:00 summary: bpo-33204: IDLE: consistently color invalid string prefixes (GH-6344) A 'u' string prefix cannot be paired with either 'r' or 'f'. Consistently color as much of the prefix, starting at the right, as is valid. (cherry picked from commit da58533ac67b01ce8f6466e6f03ff6b8b3bb04d5) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst M Lib/idlelib/colorizer.py diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index ff4084528804..f835e5874b7e 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -21,7 +21,7 @@ def make_pat(): # 1st 'file' colorized normal, 2nd as builtin, 3rd as string builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b" comment = any("COMMENT", [r"#[^\n]*"]) - stringprefix = r"(?i:\br|u|f|fr|rf|b|br|rb)?" + stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb)?" sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?" dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?' sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" @@ -265,11 +265,14 @@ def _color_delegator(parent): # htest # source = ("# Following has syntax errors\n" "if True: then int 1\nelif False: print 0\nelse: float(None)\n" "if iF + If + IF: 'keywork matching must respect case'\n" - "# All valid prefixes for unicode and byte strings should be colored\n" + "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" - "r'x', u'x', R'x', U'x', f'x', F'x', ur'is invalid'\n" + "r'x', u'x', R'x', U'x', f'x', F'x'\n" "fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x'\n" - "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n") + "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n" + "# Invalid combinations of legal characters should be half colored.\n" + "ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x'" + ) text = Text(top, background="white") text.pack(expand=1, fill="both") text.insert("insert", source) diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst new file mode 100644 index 000000000000..d5d769846eb1 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -0,0 +1,3 @@ +IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid.

1 0

bpo-33204: IDLE: consistently color invalid string prefixes (#6344)
by Terry Jan Reedy April 2, 2018

April 2, 2018

https://github.com/python/cpython/commit/da58533ac67b01ce8f6466e6f03ff6b8b3… commit: da58533ac67b01ce8f6466e6f03ff6b8b3bb04d5 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-04-02T01:47:46-04:00 summary: bpo-33204: IDLE: consistently color invalid string prefixes (#6344) A 'u' string prefix cannot be paired with either 'r' or 'f'. Consistently color as much of the prefix, starting at the right, as is valid. files: A Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst M Lib/idlelib/colorizer.py diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py index ff4084528804..f835e5874b7e 100644 --- a/Lib/idlelib/colorizer.py +++ b/Lib/idlelib/colorizer.py @@ -21,7 +21,7 @@ def make_pat(): # 1st 'file' colorized normal, 2nd as builtin, 3rd as string builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b" comment = any("COMMENT", [r"#[^\n]*"]) - stringprefix = r"(?i:\br|u|f|fr|rf|b|br|rb)?" + stringprefix = r"(?i:r|u|f|fr|rf|b|br|rb)?" sqstring = stringprefix + r"'[^'\\\n]*(\\.[^'\\\n]*)*'?" dqstring = stringprefix + r'"[^"\\\n]*(\\.[^"\\\n]*)*"?' sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" @@ -265,11 +265,14 @@ def _color_delegator(parent): # htest # source = ("# Following has syntax errors\n" "if True: then int 1\nelif False: print 0\nelse: float(None)\n" "if iF + If + IF: 'keywork matching must respect case'\n" - "# All valid prefixes for unicode and byte strings should be colored\n" + "# All valid prefixes for unicode and byte strings should be colored.\n" "'x', '''x''', \"x\", \"\"\"x\"\"\"\n" - "r'x', u'x', R'x', U'x', f'x', F'x', ur'is invalid'\n" + "r'x', u'x', R'x', U'x', f'x', F'x'\n" "fr'x', Fr'x', fR'x', FR'x', rf'x', rF'x', Rf'x', RF'x'\n" - "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n") + "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x'.rB'x',Rb'x',RB'x'\n" + "# Invalid combinations of legal characters should be half colored.\n" + "ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x'" + ) text = Text(top, background="white") text.pack(expand=1, fill="both") text.insert("insert", source) diff --git a/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst new file mode 100644 index 000000000000..d5d769846eb1 --- /dev/null +++ b/Misc/NEWS.d/next/IDLE/2018-04-02-00-28-13.bpo-33204.NBsuIv.rst @@ -0,0 +1,3 @@ +IDLE: consistently color invalid string prefixes. A 'u' string prefix cannot +be paired with either 'r' or 'f'. Consistently color as much of the prefix, +starting at the right, as is valid.

1 0