Mailman 3 October 2015 - Python-checkins

cpython (merge 3.5 -> default): Issue #25410: C implementation of OrderedDict now uses type(self) instead of
by serhiy.storchaka Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/10b965d59b49 changeset: 98831:10b965d59b49 parent: 98829:5759e9cc3639 parent: 98830:a42c0c1c5133 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 22 20:19:14 2015 +0300 summary: Issue #25410: C implementation of OrderedDict now uses type(self) instead of self.__class__ in __repr__() and __reduce__() for simplicity and reliability. files: Objects/odictobject.c | 45 +++++++++--------------------- 1 files changed, 14 insertions(+), 31 deletions(-) diff --git a/Objects/odictobject.c b/Objects/odictobject.c --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -964,9 +964,8 @@ odict_reduce(register PyODictObject *od) { _Py_IDENTIFIER(__dict__); - _Py_IDENTIFIER(__class__); _Py_IDENTIFIER(items); - PyObject *dict = NULL, *result = NULL, *cls = NULL; + PyObject *dict = NULL, *result = NULL; PyObject *items_iter, *items, *args = NULL; /* capture any instance state */ @@ -985,10 +984,6 @@ } /* build the result */ - cls = _PyObject_GetAttrId((PyObject *)od, &PyId___class__); - if (cls == NULL) - goto Done; - args = PyTuple_New(0); if (args == NULL) goto Done; @@ -1002,12 +997,11 @@ if (items_iter == NULL) goto Done; - result = PyTuple_Pack(5, cls, args, dict ? dict : Py_None, Py_None, items_iter); + result = PyTuple_Pack(5, Py_TYPE(od), args, dict ? dict : Py_None, Py_None, items_iter); Py_DECREF(items_iter); Done: Py_XDECREF(dict); - Py_XDECREF(cls); Py_XDECREF(args); return result; @@ -1456,23 +1450,25 @@ odict_repr(PyODictObject *self) { int i; - _Py_IDENTIFIER(__class__); - _Py_IDENTIFIER(__name__); _Py_IDENTIFIER(items); Py_ssize_t count = -1; - PyObject *pieces = NULL, *result = NULL, *cls = NULL; - PyObject *classname = NULL; + PyObject *pieces = NULL, *result = NULL; + const char *classname; + + classname = strrchr(Py_TYPE(self)->tp_name, '.'); + if (classname == NULL) + classname = Py_TYPE(self)->tp_name; + else + classname++; + + if (PyODict_SIZE(self) == 0) + return PyUnicode_FromFormat("%s()", classname); i = Py_ReprEnter((PyObject *)self); if (i != 0) { return i > 0 ? PyUnicode_FromString("...") : NULL; } - if (PyODict_SIZE(self) == 0) { - /* "OrderedDict()" */ - goto Finish; - } - if (PyODict_CheckExact(self)) { _ODictNode *node; pieces = PyList_New(PyODict_SIZE(self)); @@ -1506,23 +1502,10 @@ goto Done; } -Finish: - cls = _PyObject_GetAttrId((PyObject *)self, &PyId___class__); - if (cls == NULL) - goto Done; - classname = _PyObject_GetAttrId(cls, &PyId___name__); - if (classname == NULL) - goto Done; - - if (pieces == NULL) - result = PyUnicode_FromFormat("%S()", classname, pieces); - else - result = PyUnicode_FromFormat("%S(%R)", classname, pieces); + result = PyUnicode_FromFormat("%s(%R)", classname, pieces); Done: Py_XDECREF(pieces); - Py_XDECREF(cls); - Py_XDECREF(classname); Py_ReprLeave((PyObject *)self); return result; }; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25410: C implementation of OrderedDict now uses type(self) instead of
by serhiy.storchaka Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/a42c0c1c5133 changeset: 98830:a42c0c1c5133 branch: 3.5 parent: 98828:96c6ab24bdb9 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 22 20:18:24 2015 +0300 summary: Issue #25410: C implementation of OrderedDict now uses type(self) instead of self.__class__ in __repr__() and __reduce__() for simplicity and reliability. files: Objects/odictobject.c | 45 +++++++++--------------------- 1 files changed, 14 insertions(+), 31 deletions(-) diff --git a/Objects/odictobject.c b/Objects/odictobject.c --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -964,9 +964,8 @@ odict_reduce(register PyODictObject *od) { _Py_IDENTIFIER(__dict__); - _Py_IDENTIFIER(__class__); _Py_IDENTIFIER(items); - PyObject *dict = NULL, *result = NULL, *cls = NULL; + PyObject *dict = NULL, *result = NULL; PyObject *items_iter, *items, *args = NULL; /* capture any instance state */ @@ -985,10 +984,6 @@ } /* build the result */ - cls = _PyObject_GetAttrId((PyObject *)od, &PyId___class__); - if (cls == NULL) - goto Done; - args = PyTuple_New(0); if (args == NULL) goto Done; @@ -1002,12 +997,11 @@ if (items_iter == NULL) goto Done; - result = PyTuple_Pack(5, cls, args, dict ? dict : Py_None, Py_None, items_iter); + result = PyTuple_Pack(5, Py_TYPE(od), args, dict ? dict : Py_None, Py_None, items_iter); Py_DECREF(items_iter); Done: Py_XDECREF(dict); - Py_XDECREF(cls); Py_XDECREF(args); return result; @@ -1456,23 +1450,25 @@ odict_repr(PyODictObject *self) { int i; - _Py_IDENTIFIER(__class__); - _Py_IDENTIFIER(__name__); _Py_IDENTIFIER(items); Py_ssize_t count = -1; - PyObject *pieces = NULL, *result = NULL, *cls = NULL; - PyObject *classname = NULL; + PyObject *pieces = NULL, *result = NULL; + const char *classname; + + classname = strrchr(Py_TYPE(self)->tp_name, '.'); + if (classname == NULL) + classname = Py_TYPE(self)->tp_name; + else + classname++; + + if (PyODict_SIZE(self) == 0) + return PyUnicode_FromFormat("%s()", classname); i = Py_ReprEnter((PyObject *)self); if (i != 0) { return i > 0 ? PyUnicode_FromString("...") : NULL; } - if (PyODict_SIZE(self) == 0) { - /* "OrderedDict()" */ - goto Finish; - } - if (PyODict_CheckExact(self)) { _ODictNode *node; pieces = PyList_New(PyODict_SIZE(self)); @@ -1506,23 +1502,10 @@ goto Done; } -Finish: - cls = _PyObject_GetAttrId((PyObject *)self, &PyId___class__); - if (cls == NULL) - goto Done; - classname = _PyObject_GetAttrId(cls, &PyId___name__); - if (classname == NULL) - goto Done; - - if (pieces == NULL) - result = PyUnicode_FromFormat("%S()", classname, pieces); - else - result = PyUnicode_FromFormat("%S(%R)", classname, pieces); + result = PyUnicode_FromFormat("%s(%R)", classname, pieces); Done: Py_XDECREF(pieces); - Py_XDECREF(cls); - Py_XDECREF(classname); Py_ReprLeave((PyObject *)self); return result; }; -- Repository URL: https://hg.python.org/cpython

1 0

Benchmark Results for Python 2.7 2015-10-22
by lp_benchmark_robot＠intel.com Oct. 22, 2015

Oct. 22, 2015

No new revisions. Here are the previous results: Results for project Python 2.7, build date 2015-10-22 03:21:22 commit: 8953a42c2ac459b95ae23da264028f1d2a834d5b revision date: 2015-10-20 06:15:23 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v2.7.10, with hash 15c95b7d81dcf821daade360741e00714667653f from 2015-05-23 16:02:14+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.14% -0.65% 4.55% 7.75% :-) pybench 0.25% 0.01% 6.86% 6.12% :-| regex_v8 0.54% -0.30% -1.98% 6.91% :-) nbody 0.18% -0.01% 8.28% 5.63% :-) json_dump_v2 0.25% -0.29% 2.67% 15.49% :-| normal_startup 2.05% 0.45% -1.95% 3.73% :-| ssbench 0.57% 0.08% 1.01% 3.73% ---------------------------------------------------------------------------------- Note: Benchmark results for ssbench are measured in requests/second while all other are measured in seconds. * Relative Standard Deviation (Standard Deviation/Average) 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

Benchmark Results for Python Default 2015-10-22
by lp_benchmark_robot＠intel.com Oct. 22, 2015

Oct. 22, 2015

No new revisions. Here are the previous results: Results for project Python default, build date 2015-10-22 13:03:51 +0000 commit: 5759e9cc36393dc50220112435c4088c8522094c revision date: 2015-10-22 07:27:57 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v3.4.3, with hash b4cbecbc0781e89a309d03b60a1f75f8499250e6 from 2015-02-25 12:15:33+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.20% -0.47% 6.71% 18.60% :-( pybench 0.18% -0.00% -2.44% 9.17% :-( regex_v8 2.76% -0.09% -4.86% 6.60% :-( nbody 0.10% -2.91% -4.93% 11.73% :-| json_dump_v2 0.30% -0.39% -1.67% 11.43% :-| normal_startup 0.79% 0.31% -0.66% 5.70% ---------------------------------------------------------------------------------- Note: Benchmark results are measured in seconds. * Relative Standard Deviation (Standard Deviation/Average) 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

Daily reference leaks (5c7dd88cd0c5): sum=17883
by solipsis＠pitrou.net Oct. 22, 2015

Oct. 22, 2015

results for 5c7dd88cd0c5 on branch "default" -------------------------------------------- test_asyncio leaked [0, 0, 3] memory blocks, sum=3 test_capi leaked [1599, 1599, 1599] references, sum=4797 test_capi leaked [387, 389, 389] memory blocks, sum=1165 test_functools leaked [0, 2, 2] memory blocks, sum=4 test_threading leaked [3196, 3196, 3196] references, sum=9588 test_threading leaked [774, 776, 776] memory blocks, sum=2326 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogZzfm3M', '--timeout', '7200']

1 0

cpython (3.4): Issue #24782: Limit width of canvas and hence IDLE settings dialog.
by terry.reedy Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/0847398f9b00 changeset: 98827:0847398f9b00 branch: 3.4 parent: 98809:4bf862fc10a5 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Oct 22 03:27:31 2015 -0400 summary: Issue #24782: Limit width of canvas and hence IDLE settings dialog. files: Lib/idlelib/configDialog.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1389,7 +1389,7 @@ vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) canvas = Canvas(self, bd=0, highlightthickness=0, - yscrollcommand=vscrollbar.set) + yscrollcommand=vscrollbar.set, width=240) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) vscrollbar.config(command=canvas.yview) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge with 3.5
by terry.reedy Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/5759e9cc3639 changeset: 98829:5759e9cc3639 parent: 98825:5c7dd88cd0c5 parent: 98828:96c6ab24bdb9 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Oct 22 03:27:57 2015 -0400 summary: Merge with 3.5 files: Lib/idlelib/configDialog.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1389,7 +1389,7 @@ vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) canvas = Canvas(self, bd=0, highlightthickness=0, - yscrollcommand=vscrollbar.set) + yscrollcommand=vscrollbar.set, width=240) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) vscrollbar.config(command=canvas.yview) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge with 3.4
by terry.reedy Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/96c6ab24bdb9 changeset: 98828:96c6ab24bdb9 branch: 3.5 parent: 98823:642a7be9f384 parent: 98827:0847398f9b00 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Oct 22 03:27:44 2015 -0400 summary: Merge with 3.4 files: Lib/idlelib/configDialog.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1389,7 +1389,7 @@ vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) canvas = Canvas(self, bd=0, highlightthickness=0, - yscrollcommand=vscrollbar.set) + yscrollcommand=vscrollbar.set, width=240) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) vscrollbar.config(command=canvas.yview) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #24782: Limit width of canvas and hence IDLE settings dialog.
by terry.reedy Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/a96e39e20490 changeset: 98826:a96e39e20490 branch: 2.7 parent: 98808:8953a42c2ac4 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu Oct 22 03:27:27 2015 -0400 summary: Issue #24782: Limit width of canvas and hence IDLE settings dialog. files: Lib/idlelib/configDialog.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -1406,7 +1406,7 @@ vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) canvas = Canvas(self, bd=0, highlightthickness=0, - yscrollcommand=vscrollbar.set) + yscrollcommand=vscrollbar.set, width=240) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) vscrollbar.config(command=canvas.yview) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #25210: Add some basic tests for the new exception message
by berker.peksag Oct. 22, 2015

Oct. 22, 2015

https://hg.python.org/cpython/rev/5c7dd88cd0c5 changeset: 98825:5c7dd88cd0c5 user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Oct 22 07:49:36 2015 +0300 summary: Issue #25210: Add some basic tests for the new exception message files: Lib/test/test_richcmp.py | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py --- a/Lib/test/test_richcmp.py +++ b/Lib/test/test_richcmp.py @@ -253,6 +253,31 @@ self.assertTrue(a != b) self.assertTrue(a < b) + def test_exception_message(self): + class Spam: + pass + + tests = [ + (lambda: 42 < None, r"'<' .* of 'int' and 'NoneType'"), + (lambda: None < 42, r"'<' .* of 'NoneType' and 'int'"), + (lambda: 42 > None, r"'>' .* of 'int' and 'NoneType'"), + (lambda: "foo" < None, r"'<' .* of 'str' and 'NoneType'"), + (lambda: "foo" >= 666, r"'>=' .* of 'str' and 'int'"), + (lambda: 42 <= None, r"'<=' .* of 'int' and 'NoneType'"), + (lambda: 42 >= None, r"'>=' .* of 'int' and 'NoneType'"), + (lambda: 42 < [], r"'<' .* of 'int' and 'list'"), + (lambda: () > [], r"'>' .* of 'tuple' and 'list'"), + (lambda: None >= None, r"'>=' .* of 'NoneType' and 'NoneType'"), + (lambda: Spam() < 42, r"'<' .* of 'Spam' and 'int'"), + (lambda: 42 < Spam(), r"'<' .* of 'int' and 'Spam'"), + (lambda: Spam() <= Spam(), r"'<=' .* of 'Spam' and 'Spam'"), + ] + for i, test in enumerate(tests): + with self.subTest(test=i): + with self.assertRaisesRegex(TypeError, test[1]): + test[0]() + + class DictTest(unittest.TestCase): def test_dicts(self): -- Repository URL: https://hg.python.org/cpython

1 0