Mailman 3 September 2017 - Python-checkins

bpo-31621: Fix typo in Simple Statements documentation (GH-3809) (GH-3810)
by Mariatta Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/641494ec3168bd556f0af226196e13ae29… commit: 641494ec3168bd556f0af226196e13ae29bddd53 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-09-28T13:00:17-07:00 summary: bpo-31621: Fix typo in Simple Statements documentation (GH-3809) (GH-3810) Replace "restriction" with "restrictions". (cherry picked from commit … [View More]

1 0

Fix typo in Simple Statements documentation (GH-3809)
by Mariatta Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/8d59aca4a953b097a9b02b0ecafef840e4… commit: 8d59aca4a953b097a9b02b0ecafef840e4ac5855 branch: master author: kms70847 <kms70847(a)users.noreply.github.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-09-28T12:54:48-07:00 summary: Fix typo in Simple Statements documentation (GH-3809) Replace "restriction" with "restrictions". files: M Doc/reference/simple_stmts.rst diff --git a/Doc/reference/simple_stmts.rst b/Doc/… [View More]

1 0

bpo-28129: fix ctypes crashes (#386) (#3799)
by Victor Stinner Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/7d6ddb96b34b94c1cbdf95baa94492c484… commit: 7d6ddb96b34b94c1cbdf95baa94492c48426404e branch: 3.6 author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-09-28T07:32:11-07:00 summary: bpo-28129: fix ctypes crashes (#386) (#3799) * init commit, with initial tests for from_param and fields __set__ and __get__, and some additions to from_buffer and from_buffer_copy * added the rest of tests and … [View More]patches. probably only a first draft. * removed trailing spaces * replace ctype with ctypes in error messages * change back from ctypes instance to ctype instance (cherry picked from commit 1bea762d9ec823544c530d567330a47f64d93d4f) files: M Lib/ctypes/test/test_frombuffer.py M Lib/ctypes/test/test_funcptr.py M Lib/ctypes/test/test_parameters.py M Lib/ctypes/test/test_pointers.py M Lib/ctypes/test/test_struct_fields.py M Modules/_ctypes/_ctypes.c M Modules/_ctypes/cfield.c diff --git a/Lib/ctypes/test/test_frombuffer.py b/Lib/ctypes/test/test_frombuffer.py index 7ab38f1b031..55c244356b3 100644 --- a/Lib/ctypes/test/test_frombuffer.py +++ b/Lib/ctypes/test/test_frombuffer.py @@ -121,12 +121,21 @@ def test_from_buffer_copy_with_offset(self): (c_int * 1).from_buffer_copy(a, 16 * sizeof(c_int)) def test_abstract(self): + from ctypes import _Pointer, _SimpleCData, _CFuncPtr + self.assertRaises(TypeError, Array.from_buffer, bytearray(10)) self.assertRaises(TypeError, Structure.from_buffer, bytearray(10)) self.assertRaises(TypeError, Union.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _CFuncPtr.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _Pointer.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _SimpleCData.from_buffer, bytearray(10)) + self.assertRaises(TypeError, Array.from_buffer_copy, b"123") self.assertRaises(TypeError, Structure.from_buffer_copy, b"123") self.assertRaises(TypeError, Union.from_buffer_copy, b"123") + self.assertRaises(TypeError, _CFuncPtr.from_buffer_copy, b"123") + self.assertRaises(TypeError, _Pointer.from_buffer_copy, b"123") + self.assertRaises(TypeError, _SimpleCData.from_buffer_copy, b"123") if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py index f34734b164e..e0b9b54e97f 100644 --- a/Lib/ctypes/test/test_funcptr.py +++ b/Lib/ctypes/test/test_funcptr.py @@ -123,5 +123,10 @@ def c_string(init): self.assertEqual(strtok(None, b"\n"), b"c") self.assertEqual(strtok(None, b"\n"), None) + def test_abstract(self): + from ctypes import _CFuncPtr + + self.assertRaises(TypeError, _CFuncPtr, 13, "name", 42, "iid") + if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py index a61f1c7fa76..e4c25fd880c 100644 --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -170,6 +170,16 @@ def from_param(cls, obj): # ArgumentError: argument 1: ValueError: 99 self.assertRaises(ArgumentError, func, 99) + def test_abstract(self): + from ctypes import (Array, Structure, Union, _Pointer, + _SimpleCData, _CFuncPtr) + + self.assertRaises(TypeError, Array.from_param, 42) + self.assertRaises(TypeError, Structure.from_param, 42) + self.assertRaises(TypeError, Union.from_param, 42) + self.assertRaises(TypeError, _CFuncPtr.from_param, 42) + self.assertRaises(TypeError, _Pointer.from_param, 42) + self.assertRaises(TypeError, _SimpleCData.from_param, 42) @test.support.cpython_only def test_issue31311(self): diff --git a/Lib/ctypes/test/test_pointers.py b/Lib/ctypes/test/test_pointers.py index 751f85fd11f..e97515879f1 100644 --- a/Lib/ctypes/test/test_pointers.py +++ b/Lib/ctypes/test/test_pointers.py @@ -213,6 +213,11 @@ def test_pointer_type_str_name(self): from ctypes import _pointer_type_cache del _pointer_type_cache[id(P)] + def test_abstract(self): + from ctypes import _Pointer + + self.assertRaises(TypeError, _Pointer.set_type, 42) + if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_struct_fields.py b/Lib/ctypes/test/test_struct_fields.py index 22eb3b0cd7b..8045cc82679 100644 --- a/Lib/ctypes/test/test_struct_fields.py +++ b/Lib/ctypes/test/test_struct_fields.py @@ -46,5 +46,29 @@ class Y(X): Y._fields_ = [] self.assertRaises(AttributeError, setattr, X, "_fields_", []) + # __set__ and __get__ should raise a TypeError in case their self + # argument is not a ctype instance. + def test___set__(self): + class MyCStruct(Structure): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCStruct.field.__set__, 'wrong type self', 42) + + class MyCUnion(Union): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCUnion.field.__set__, 'wrong type self', 42) + + def test___get__(self): + class MyCStruct(Structure): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCStruct.field.__get__, 'wrong type self', 42) + + class MyCUnion(Union): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCUnion.field.__get__, 'wrong type self', 42) + if __name__ == "__main__": unittest.main() diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 27f6dd43449..258e805870b 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -990,6 +990,7 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (proto) { StgDictObject *itemdict = PyType_stgdict(proto); const char *current_format; + /* PyCPointerType_SetProto has verified proto has a stgdict. */ assert(itemdict); /* If itemdict->format is NULL, then this is a pointer to an incomplete type. We create a generic format string @@ -1036,7 +1037,11 @@ PyCPointerType_set_type(PyTypeObject *self, PyObject *type) StgDictObject *dict; dict = PyType_stgdict((PyObject *)self); - assert(dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } if (-1 == PyCPointerType_SetProto(dict, type)) return NULL; @@ -1062,7 +1067,11 @@ PyCPointerType_from_param(PyObject *type, PyObject *value) } typedict = PyType_stgdict(type); - assert(typedict); /* Cannot be NULL for pointer types */ + if (!typedict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } /* If we expect POINTER(<type>), but receive a <type> instance, accept it by calling byref(<type>). @@ -2127,7 +2136,11 @@ PyCSimpleType_from_param(PyObject *type, PyObject *value) } dict = PyType_stgdict(type); - assert(dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } /* I think we can rely on this being a one-character string */ fmt = PyUnicode_AsUTF8(dict->proto); @@ -3231,7 +3244,11 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags) PyObject *argtypes; dict = PyType_stgdict((PyObject *)type); - assert(dict); /* Cannot be NULL. 'type' is a PyCFuncPtr type. */ + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return 0; + } argtypes = dict->argtypes; if (paramflags == NULL || dict->argtypes == NULL) @@ -4862,7 +4879,7 @@ Pointer_ass_item(PyObject *myself, Py_ssize_t index, PyObject *value) } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ proto = stgdict->proto; assert(proto); @@ -4890,7 +4907,7 @@ Pointer_get_contents(CDataObject *self, void *closure) } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ return PyCData_FromBaseObj(stgdict->proto, (PyObject *)self, 0, *(void **)self->b_ptr); @@ -4909,7 +4926,7 @@ Pointer_set_contents(CDataObject *self, PyObject *value, void *closure) return -1; } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ assert(stgdict->proto); if (!CDataObject_Check(value)) { int res = PyObject_IsInstance(value, stgdict->proto); diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 113a815db15..e39065fa939 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -205,7 +205,11 @@ PyCField_set(CFieldObject *self, PyObject *inst, PyObject *value) { CDataObject *dst; char *ptr; - assert(CDataObject_Check(inst)); + if (!CDataObject_Check(inst)) { + PyErr_SetString(PyExc_TypeError, + "not a ctype instance"); + return -1; + } dst = (CDataObject *)inst; ptr = dst->b_ptr + self->offset; if (value == NULL) { @@ -225,7 +229,11 @@ PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type) Py_INCREF(self); return (PyObject *)self; } - assert(CDataObject_Check(inst)); + if (!CDataObject_Check(inst)) { + PyErr_SetString(PyExc_TypeError, + "not a ctype instance"); + return NULL; + } src = (CDataObject *)inst; return PyCData_get(self->proto, self->getfunc, inst, self->index, self->size, src->b_ptr + self->offset); [View Less]

1 0

bpo-28129: fix ctypes crashes (#386) (#3800)
by Victor Stinner Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/8b83687bdf66d2d10afb78e46bcede399d… commit: 8b83687bdf66d2d10afb78e46bcede399deaefde branch: 2.7 author: Victor Stinner <victor.stinner(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-09-28T07:31:40-07:00 summary: bpo-28129: fix ctypes crashes (#386) (#3800) * init commit, with initial tests for from_param and fields __set__ and __get__, and some additions to from_buffer and from_buffer_copy * added the rest of tests and … [View More]patches. probably only a first draft. * removed trailing spaces * replace ctype with ctypes in error messages * change back from ctypes instance to ctype instance (cherry picked from commit 1bea762d9ec823544c530d567330a47f64d93d4f) files: M Lib/ctypes/test/test_frombuffer.py M Lib/ctypes/test/test_funcptr.py M Lib/ctypes/test/test_parameters.py M Lib/ctypes/test/test_pointers.py M Lib/ctypes/test/test_struct_fields.py M Modules/_ctypes/_ctypes.c M Modules/_ctypes/cfield.c diff --git a/Lib/ctypes/test/test_frombuffer.py b/Lib/ctypes/test/test_frombuffer.py index d708ed6906f..99c32e095b8 100644 --- a/Lib/ctypes/test/test_frombuffer.py +++ b/Lib/ctypes/test/test_frombuffer.py @@ -78,12 +78,21 @@ def test_fom_buffer_copy_with_offset(self): (c_int * 1).from_buffer_copy, a, 16 * sizeof(c_int)) def test_abstract(self): + from ctypes import _Pointer, _SimpleCData, _CFuncPtr + self.assertRaises(TypeError, Array.from_buffer, bytearray(10)) self.assertRaises(TypeError, Structure.from_buffer, bytearray(10)) self.assertRaises(TypeError, Union.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _CFuncPtr.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _Pointer.from_buffer, bytearray(10)) + self.assertRaises(TypeError, _SimpleCData.from_buffer, bytearray(10)) + self.assertRaises(TypeError, Array.from_buffer_copy, b"123") self.assertRaises(TypeError, Structure.from_buffer_copy, b"123") self.assertRaises(TypeError, Union.from_buffer_copy, b"123") + self.assertRaises(TypeError, _CFuncPtr.from_buffer_copy, b"123") + self.assertRaises(TypeError, _Pointer.from_buffer_copy, b"123") + self.assertRaises(TypeError, _SimpleCData.from_buffer_copy, b"123") if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py index 58cbb47af49..575030327e0 100644 --- a/Lib/ctypes/test/test_funcptr.py +++ b/Lib/ctypes/test/test_funcptr.py @@ -123,5 +123,10 @@ def c_string(init): self.assertEqual(strtok(None, "\n"), "c") self.assertEqual(strtok(None, "\n"), None) + def test_abstract(self): + from ctypes import _CFuncPtr + + self.assertRaises(TypeError, _CFuncPtr, 13, "name", 42, "iid") + if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py index 0cac9069c6c..c6231f706b9 100644 --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -175,6 +175,16 @@ def from_param(cls, obj): # ArgumentError: argument 1: ValueError: 99 self.assertRaises(ArgumentError, func, 99) + def test_abstract(self): + from ctypes import (Array, Structure, Union, _Pointer, + _SimpleCData, _CFuncPtr) + + self.assertRaises(TypeError, Array.from_param, 42) + self.assertRaises(TypeError, Structure.from_param, 42) + self.assertRaises(TypeError, Union.from_param, 42) + self.assertRaises(TypeError, _CFuncPtr.from_param, 42) + self.assertRaises(TypeError, _Pointer.from_param, 42) + self.assertRaises(TypeError, _SimpleCData.from_param, 42) @test.support.cpython_only def test_issue31311(self): diff --git a/Lib/ctypes/test/test_pointers.py b/Lib/ctypes/test/test_pointers.py index 24b0546c89b..4a8887c1dee 100644 --- a/Lib/ctypes/test/test_pointers.py +++ b/Lib/ctypes/test/test_pointers.py @@ -210,6 +210,11 @@ def test_pointer_type_str_name(self): from ctypes import _pointer_type_cache del _pointer_type_cache[id(P)] + def test_abstract(self): + from ctypes import _Pointer + + self.assertRaises(TypeError, _Pointer.set_type, 42) + if __name__ == '__main__': unittest.main() diff --git a/Lib/ctypes/test/test_struct_fields.py b/Lib/ctypes/test/test_struct_fields.py index 22eb3b0cd7b..8045cc82679 100644 --- a/Lib/ctypes/test/test_struct_fields.py +++ b/Lib/ctypes/test/test_struct_fields.py @@ -46,5 +46,29 @@ class Y(X): Y._fields_ = [] self.assertRaises(AttributeError, setattr, X, "_fields_", []) + # __set__ and __get__ should raise a TypeError in case their self + # argument is not a ctype instance. + def test___set__(self): + class MyCStruct(Structure): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCStruct.field.__set__, 'wrong type self', 42) + + class MyCUnion(Union): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCUnion.field.__set__, 'wrong type self', 42) + + def test___get__(self): + class MyCStruct(Structure): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCStruct.field.__get__, 'wrong type self', 42) + + class MyCUnion(Union): + _fields_ = (("field", c_int),) + self.assertRaises(TypeError, + MyCUnion.field.__get__, 'wrong type self', 42) + if __name__ == "__main__": unittest.main() diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index fb7e9859db2..25740ed7712 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -1036,6 +1036,7 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) if (proto) { StgDictObject *itemdict = PyType_stgdict(proto); const char *current_format; + /* PyCPointerType_SetProto has verified proto has a stgdict. */ assert(itemdict); /* If itemdict->format is NULL, then this is a pointer to an incomplete type. We create a generic format string @@ -1082,7 +1083,11 @@ PyCPointerType_set_type(PyTypeObject *self, PyObject *type) StgDictObject *dict; dict = PyType_stgdict((PyObject *)self); - assert(dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } if (-1 == PyCPointerType_SetProto(dict, type)) return NULL; @@ -1108,7 +1113,11 @@ PyCPointerType_from_param(PyObject *type, PyObject *value) } typedict = PyType_stgdict(type); - assert(typedict); /* Cannot be NULL for pointer types */ + if (!typedict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } /* If we expect POINTER(<type>), but receive a <type> instance, accept it by calling byref(<type>). @@ -2226,7 +2235,11 @@ PyCSimpleType_from_param(PyObject *type, PyObject *value) } dict = PyType_stgdict(type); - assert(dict); + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return NULL; + } /* I think we can rely on this being a one-character string */ fmt = PyString_AsString(dict->proto); @@ -3347,7 +3360,11 @@ _validate_paramflags(PyTypeObject *type, PyObject *paramflags) PyObject *argtypes; dict = PyType_stgdict((PyObject *)type); - assert(dict); /* Cannot be NULL. 'type' is a PyCFuncPtr type. */ + if (!dict) { + PyErr_SetString(PyExc_TypeError, + "abstract class"); + return 0; + } argtypes = dict->argtypes; if (paramflags == NULL || dict->argtypes == NULL) @@ -5090,7 +5107,7 @@ Pointer_ass_item(PyObject *_self, Py_ssize_t index, PyObject *value) } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ proto = stgdict->proto; assert(proto); @@ -5118,7 +5135,7 @@ Pointer_get_contents(CDataObject *self, void *closure) } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ return PyCData_FromBaseObj(stgdict->proto, (PyObject *)self, 0, *(void **)self->b_ptr); @@ -5137,7 +5154,7 @@ Pointer_set_contents(CDataObject *self, PyObject *value, void *closure) return -1; } stgdict = PyObject_stgdict((PyObject *)self); - assert(stgdict); /* Cannot be NULL fr pointer instances */ + assert(stgdict); /* Cannot be NULL for pointer instances */ assert(stgdict->proto); if (!CDataObject_Check(value)) { int res = PyObject_IsInstance(value, stgdict->proto); diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index e033cd5fffe..6f632d0a072 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -205,7 +205,11 @@ PyCField_set(CFieldObject *self, PyObject *inst, PyObject *value) { CDataObject *dst; char *ptr; - assert(CDataObject_Check(inst)); + if (!CDataObject_Check(inst)) { + PyErr_SetString(PyExc_TypeError, + "not a ctype instance"); + return -1; + } dst = (CDataObject *)inst; ptr = dst->b_ptr + self->offset; if (value == NULL) { @@ -225,7 +229,11 @@ PyCField_get(CFieldObject *self, PyObject *inst, PyTypeObject *type) Py_INCREF(self); return (PyObject *)self; } - assert(CDataObject_Check(inst)); + if (!CDataObject_Check(inst)) { + PyErr_SetString(PyExc_TypeError, + "not a ctype instance"); + return NULL; + } src = (CDataObject *)inst; return PyCData_get(self->proto, self->getfunc, inst, self->index, self->size, src->b_ptr + self->offset); [View Less]

1 0

[3.6] bpo-31536: Avoid wholesale rebuild after `make regen-all` (GH-3678) (#3797)
by Antoine Pitrou Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/ec3d34c5b2feb10cb4d7606a10d81c178c… commit: ec3d34c5b2feb10cb4d7606a10d81c178c3afce3 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2017-09-28T13:21:32+02:00 summary: [3.6] bpo-31536: Avoid wholesale rebuild after `make regen-all` (GH-3678) (#3797) bpo-31536: Avoid wholesale rebuild after `make regen-all` files: A Misc/NEWS.d/next/Build/2017-… [View More]09-20-21-32-21.bpo-31536.KUDjno.rst A Tools/scripts/update_file.py M Makefile.pre.in M Parser/asdl_c.py diff --git a/Makefile.pre.in b/Makefile.pre.in index 6cb0c63e5d6..6a0118f7871 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -230,6 +230,7 @@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@ +UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ BUILD_GNU_TYPE= @build@ @@ -696,12 +697,14 @@ regen-importlib: Programs/_freeze_importlib # from Lib/importlib/_bootstrap_external.py using _freeze_importlib ./Programs/_freeze_importlib \ $(srcdir)/Lib/importlib/_bootstrap_external.py \ - $(srcdir)/Python/importlib_external.h + $(srcdir)/Python/importlib_external.h.new + $(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new # Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py # using _freeze_importlib ./Programs/_freeze_importlib \ $(srcdir)/Lib/importlib/_bootstrap.py \ - $(srcdir)/Python/importlib.h + $(srcdir)/Python/importlib.h.new + $(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new ############################################################################ @@ -775,8 +778,10 @@ regen-grammar: $(PGEN) # from Grammar/Grammar using pgen @$(MKDIR_P) Include $(PGEN) $(srcdir)/Grammar/Grammar \ - $(srcdir)/Include/graminit.h \ - $(srcdir)/Python/graminit.c + $(srcdir)/Include/graminit.h.new \ + $(srcdir)/Python/graminit.c.new + $(UPDATE_FILE) $(srcdir)/Include/graminit.h $(srcdir)/Include/graminit.h.new + $(UPDATE_FILE) $(srcdir)/Python/graminit.c $(srcdir)/Python/graminit.c.new Parser/grammar.o: $(srcdir)/Parser/grammar.c \ $(srcdir)/Include/token.h \ @@ -794,13 +799,15 @@ regen-ast: # Regenerate Include/Python-ast.h using Parser/asdl_c.py -h $(MKDIR_P) $(srcdir)/Include $(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \ - -h $(srcdir)/Include \ + -h $(srcdir)/Include/Python-ast.h.new \ $(srcdir)/Parser/Python.asdl + $(UPDATE_FILE) $(srcdir)/Include/Python-ast.h $(srcdir)/Include/Python-ast.h.new # Regenerate Python/Python-ast.c using Parser/asdl_c.py -c $(MKDIR_P) $(srcdir)/Python $(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \ - -c $(srcdir)/Python \ + -c $(srcdir)/Python/Python-ast.c.new \ $(srcdir)/Parser/Python.asdl + $(UPDATE_FILE) $(srcdir)/Python/Python-ast.c $(srcdir)/Python/Python-ast.c.new .PHONY: regen-opcode regen-opcode: @@ -808,7 +815,8 @@ regen-opcode: # using Tools/scripts/generate_opcode_h.py $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_opcode_h.py \ $(srcdir)/Lib/opcode.py \ - $(srcdir)/Include/opcode.h + $(srcdir)/Include/opcode.h.new + $(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h @@ -865,7 +873,8 @@ regen-opcode-targets: # Regenerate Python/opcode_targets.h from Lib/opcode.py # using Python/makeopcodetargets.py $(PYTHON_FOR_REGEN) $(srcdir)/Python/makeopcodetargets.py \ - $(srcdir)/Python/opcode_targets.h + $(srcdir)/Python/opcode_targets.h.new + $(UPDATE_FILE) $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/opcode_targets.h.new Python/ceval.o: $(srcdir)/Python/opcode_targets.h $(srcdir)/Python/ceval_gil.h @@ -892,7 +901,8 @@ regen-typeslots: # using Objects/typeslots.py $(PYTHON_FOR_REGEN) $(srcdir)/Objects/typeslots.py \ < $(srcdir)/Include/typeslots.h \ - $(srcdir)/Objects/typeslots.inc + $(srcdir)/Objects/typeslots.inc.new + $(UPDATE_FILE) $(srcdir)/Objects/typeslots.inc $(srcdir)/Objects/typeslots.inc.new ############################################################################ # Header files diff --git a/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst b/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst new file mode 100644 index 00000000000..414f1a45eab --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-20-21-32-21.bpo-31536.KUDjno.rst @@ -0,0 +1 @@ +Avoid wholesale rebuild after `make regen-all` if nothing changed. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 1e5f4d9a2a5..6302af6fa3e 100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1281,59 +1281,55 @@ def main(srcfile, dump_module=False): print(mod) if not asdl.check(mod): sys.exit(1) - if INC_DIR: - p = "%s/%s-ast.h" % (INC_DIR, mod.name) - f = open(p, "w") - f.write(auto_gen_msg) - f.write('#include "asdl.h"\n\n') - c = ChainOfVisitors(TypeDefVisitor(f), - StructVisitor(f), - PrototypeVisitor(f), - ) - c.visit(mod) - f.write("PyObject* PyAST_mod2obj(mod_ty t);\n") - f.write("mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);\n") - f.write("int PyAST_Check(PyObject* obj);\n") - f.close() - - if SRC_DIR: - p = os.path.join(SRC_DIR, str(mod.name) + "-ast.c") - f = open(p, "w") - f.write(auto_gen_msg) - f.write('#include <stddef.h>\n') - f.write('\n') - f.write('#include "Python.h"\n') - f.write('#include "%s-ast.h"\n' % mod.name) - f.write('\n') - f.write("static PyTypeObject AST_type;\n") - v = ChainOfVisitors( - PyTypesDeclareVisitor(f), - PyTypesVisitor(f), - Obj2ModPrototypeVisitor(f), - FunctionVisitor(f), - ObjVisitor(f), - Obj2ModVisitor(f), - ASTModuleVisitor(f), - PartingShots(f), - ) - v.visit(mod) - f.close() + if H_FILE: + with open(H_FILE, "w") as f: + f.write(auto_gen_msg) + f.write('#include "asdl.h"\n\n') + c = ChainOfVisitors(TypeDefVisitor(f), + StructVisitor(f), + PrototypeVisitor(f), + ) + c.visit(mod) + f.write("PyObject* PyAST_mod2obj(mod_ty t);\n") + f.write("mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);\n") + f.write("int PyAST_Check(PyObject* obj);\n") + + if C_FILE: + with open(C_FILE, "w") as f: + f.write(auto_gen_msg) + f.write('#include <stddef.h>\n') + f.write('\n') + f.write('#include "Python.h"\n') + f.write('#include "%s-ast.h"\n' % mod.name) + f.write('\n') + f.write("static PyTypeObject AST_type;\n") + v = ChainOfVisitors( + PyTypesDeclareVisitor(f), + PyTypesVisitor(f), + Obj2ModPrototypeVisitor(f), + FunctionVisitor(f), + ObjVisitor(f), + Obj2ModVisitor(f), + ASTModuleVisitor(f), + PartingShots(f), + ) + v.visit(mod) if __name__ == "__main__": import getopt - INC_DIR = '' - SRC_DIR = '' + H_FILE = '' + C_FILE = '' dump_module = False opts, args = getopt.getopt(sys.argv[1:], "dh:c:") for o, v in opts: if o == '-h': - INC_DIR = v + H_FILE = v if o == '-c': - SRC_DIR = v + C_FILE = v if o == '-d': dump_module = True - if INC_DIR and SRC_DIR: + if H_FILE and C_FILE: print('Must specify exactly one output file') sys.exit(1) elif len(args) != 1: diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py new file mode 100644 index 00000000000..224585c69bb --- /dev/null +++ b/Tools/scripts/update_file.py @@ -0,0 +1,28 @@ +""" +A script that replaces an old file with a new one, only if the contents +actually changed. If not, the new file is simply deleted. + +This avoids wholesale rebuilds when a code (re)generation phase does not +actually change the in-tree generated code. +""" + +import os +import sys + + +def main(old_path, new_path): + with open(old_path, 'rb') as f: + old_contents = f.read() + with open(new_path, 'rb') as f: + new_contents = f.read() + if old_contents != new_contents: + os.replace(new_path, old_path) + else: + os.unlink(new_path) + + +if __name__ == '__main__': + if len(sys.argv) != 3: + print("Usage: %s <path to be updated> <path with new contents>" % (sys.argv[0],)) + sys.exit(1) + main(sys.argv[1], sys.argv[2]) [View Less]

1 0

[3.6] bpo-31478: Fix an assertion failure in random.seed() in case a seed has a bad __abs__() method. (GH-3596) (#3794)
by Serhiy Storchaka Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/befc956acf8ddeb94f000ed081ddec5131… commit: befc956acf8ddeb94f000ed081ddec51315429e5 branch: 3.6 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2017-09-28T12:17:51+03:00 summary: [3.6] bpo-31478: Fix an assertion failure in random.seed() in case a seed has a bad __abs__() method. (GH-3596) (#3794) (cherry picked from commit d780b2d588e68bd7047ef5d1f04e36da38b7a350) files: A Misc/NEWS.d/next/… [View More]Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst M Lib/test/test_random.py M Modules/_randommodule.c diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index a2d9a961cc8..b42bf2a7124 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -423,6 +423,17 @@ def test_bug_27706(self): ['0x1.b0580f98a7dbep-1', '0x1.84129978f9c1ap-1', '0x1.aeaa51052e978p-2', '0x1.092178fb945a6p-2']) + def test_bug_31478(self): + # There shouldn't be an assertion failure in _random.Random.seed() in + # case the argument has a bad __abs__() method. + class BadInt(int): + def __abs__(self): + return None + try: + self.gen.seed(BadInt()) + except TypeError: + pass + def test_bug_31482(self): # Verify that version 1 seeds are unaffected by hash randomization # when the seeds are expressed as bytes rather than strings. diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst new file mode 100644 index 00000000000..bbeb810ebaa --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst @@ -0,0 +1,2 @@ +Fix an assertion failure in `_random.Random.seed()` in case the argument has a +bad ``__abs__()`` method. Patch by Oren Milman. diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index d006aebf927..769084fa88d 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -259,8 +259,11 @@ random_seed(RandomObject *self, PyObject *args) * So: if the arg is a PyLong, use its absolute value. * Otherwise use its hash value, cast to unsigned. */ - if (PyLong_Check(arg)) - n = PyNumber_Absolute(arg); + if (PyLong_Check(arg)) { + /* Calling int.__abs__() prevents calling arg.__abs__(), which might + return an invalid value. See issue #31478. */ + n = PyLong_Type.tp_as_number->nb_absolute(arg); + } else { Py_hash_t hash = PyObject_Hash(arg); if (hash == -1) [View Less]

1 0

Daily reference leaks (4243df51fe43): sum=71
by solipsis＠pitrou.net Sept. 28, 2017

Sept. 28, 2017

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 7, -7] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_fork leaked [44, 0, 0] references, sum=44 test_multiprocessing_fork leaked [21, 0, 0] memory blocks, sum=21 test_multiprocessing_fork leaked [2, 0, 0] file descriptors, sum=2 test_multiprocessing_forkserver leaked [-2, 2, 0] memory blocks, sum=0 test_multiprocessing_spawn … [View More]

1 0

bpo-31478: Fix an assertion failure in random.seed() in case a seed has a bad __abs__() method. (#3596)
by Serhiy Storchaka Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/d780b2d588e68bd7047ef5d1f04e36da38… commit: d780b2d588e68bd7047ef5d1f04e36da38b7a350 branch: master author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-09-28T10:50:01+03:00 summary: bpo-31478: Fix an assertion failure in random.seed() in case a seed has a bad __abs__() method. (#3596) files: A Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst M Lib/test/… [View More]test_random.py M Modules/_randommodule.c diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 5d12aee1695..e2db72330c5 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -430,6 +430,17 @@ def test_bug_27706(self): ['0x1.b0580f98a7dbep-1', '0x1.84129978f9c1ap-1', '0x1.aeaa51052e978p-2', '0x1.092178fb945a6p-2']) + def test_bug_31478(self): + # There shouldn't be an assertion failure in _random.Random.seed() in + # case the argument has a bad __abs__() method. + class BadInt(int): + def __abs__(self): + return None + try: + self.gen.seed(BadInt()) + except TypeError: + pass + def test_bug_31482(self): # Verify that version 1 seeds are unaffected by hash randomization # when the seeds are expressed as bytes rather than strings. diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst new file mode 100644 index 00000000000..bbeb810ebaa --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-09-15-09-13-07.bpo-31478.o06iKD.rst @@ -0,0 +1,2 @@ +Fix an assertion failure in `_random.Random.seed()` in case the argument has a +bad ``__abs__()`` method. Patch by Oren Milman. diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c index 747a5473420..51677f8b00a 100644 --- a/Modules/_randommodule.c +++ b/Modules/_randommodule.c @@ -259,8 +259,11 @@ random_seed(RandomObject *self, PyObject *args) * So: if the arg is a PyLong, use its absolute value. * Otherwise use its hash value, cast to unsigned. */ - if (PyLong_Check(arg)) - n = PyNumber_Absolute(arg); + if (PyLong_Check(arg)) { + /* Calling int.__abs__() prevents calling arg.__abs__(), which might + return an invalid value. See issue #31478. */ + n = PyLong_Type.tp_as_number->nb_absolute(arg); + } else { Py_hash_t hash = PyObject_Hash(arg); if (hash == -1) [View Less]

1 0

[3.6] closes bpo-22140: Prevent double substitution of prefix in python-config.sh (GH-3769) (#3793)
by Benjamin Peterson Sept. 28, 2017

Sept. 28, 2017

https://github.com/python/cpython/commit/68b131d5b674549bb637b366730497714a… commit: 68b131d5b674549bb637b366730497714ad11328 branch: 3.6 author: Benjamin Peterson <benjamin(a)python.org> committer: GitHub <noreply(a)github.com> date: 2017-09-27T20:27:41-07:00 summary: [3.6] closes bpo-22140: Prevent double substitution of prefix in python-config.sh (GH-3769) (#3793) Fix the logic in python-config.sh to avoid attempting to substitute prefix in a variable that might have already … [View More]been subject to substitution. This e.g. happened if @exec_prefix@ was defined as "${prefix}" (which is the default of the configure script) -- in which case the exec_prefix_build variable was initialized with already-subtituted prefix, and then another round of substitution was performed which might have resulted in duplicate prefix. To avoid that, rename the variables so that the variables matching likely configure names (prefix, exec_prefix) retain their original values and a '_real' suffix is used for the real values of prefix. Furthermore, replace the unnecessary prefix and exec_prefix substitutions with direct prefix_real references since the sed always replaced the whole string anyway by design. (cherry picked from commit 14086cfc5eed8c5e78342d79e5db87a135d75fa8) files: A Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst M Misc/python-config.sh.in diff --git a/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst b/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst new file mode 100644 index 00000000000..e20c0942f6c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-26-22-39-58.bpo-22140.ZRf7Wn.rst @@ -0,0 +1 @@ +Prevent double substitution of prefix in python-config.sh. diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in index 30c69278710..d1d3275fa27 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -24,17 +24,18 @@ installed_prefix () echo $RESULT } -prefix_build="@prefix@" prefix_real=$(installed_prefix "$0") # Use sed to fix paths from their built-to locations to their installed-to -# locations. -prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") -exec_prefix_build="@exec_prefix@" -exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") -libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") -CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") +# locations. Keep prefix & exec_prefix using their original values in case +# they are referenced in other configure variables, to prevent double +# substitution, issue #22140. +prefix="@prefix@" +exec_prefix="@exec_prefix@" +exec_prefix_real=${prefix_real} +includedir=$(echo "@includedir@" | sed "s#$prefix#$prefix_real#") +libdir=$(echo "@libdir@" | sed "s#$prefix#$prefix_real#") +CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix#$prefix_real#") VERSION="@VERSION@" LIBM="@LIBM@" LIBC="@LIBC@" @@ -47,8 +48,8 @@ LINKFORSHARED="@LINKFORSHARED@" OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" -LIBDEST=${prefix}/lib/python${VERSION} -LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") +LIBDEST=${prefix_real}/lib/python${VERSION} +LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#") SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" @@ -73,10 +74,10 @@ for ARG in "$@" do case "$ARG" in --prefix) - echo "$prefix" + echo "$prefix_real" ;; --exec-prefix) - echo "$exec_prefix" + echo "$exec_prefix_real" ;; --includes) echo "$INCDIR $PLATINCDIR" [View Less]

1 0

[1 up, 64 flat] Results for Python (master branch) 2017-09-27
by lp_benchmark_robot＠intel.com Sept. 28, 2017

Sept. 28, 2017

Results for project python/master, build date: 2017-09-27 03:03:03-07:00. - commit: 236329e - previous commit: 0e950dd - revision date: 2017-09-26 23:13:15-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+… [View More]00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 0.780% | -0.146% | +5.271% | +7.000% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.343% | -0.021% | +17.590% | +17.181% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 0.319% | +0.150% | +19.024% | +16.917% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.357% | -0.048% | +17.341% | +17.439% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.388% | -0.062% | +3.513% | +11.735% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 2.497% | -1.033% | +11.233% | +8.553% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 1.351% | -0.021% | +7.893% | +9.691% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.517% | +0.111% | +3.362% | +6.538% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.384% | -0.588% | +4.820% | +20.572% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 2.668% | +1.048% | +10.786% | +12.135% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.456% | +0.403% | +3.725% | +5.988% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 1.241% | +0.052% | +7.320% | +4.624% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.963% | -0.129% | +4.050% | +5.540% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.231% | +0.566% | +7.920% | +11.808% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.603% | +0.723% | +6.688% | +9.368% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.950% | +0.566% | +7.698% | +9.474% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.414% | +0.168% | +9.410% | +11.606% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.266% | -0.093% | +8.756% | +9.354% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.362% | +0.833% | +5.341% | +7.099% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 2.086% | +0.078% | +2.464% | +9.639% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.274% | +0.083% | +9.603% | +10.931% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.775% | -0.566% | +46.331% | +12.671% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.675% | +0.379% | +9.225% | +11.815% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.600% | +1.103% | +18.853% | +11.319% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 1.075% | +0.193% | +8.435% | +8.758% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.590% | -0.737% | +3.836% | +4.679% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.803% | +0.231% | -0.579% | +1.361% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 3.187% | -0.616% | +1.257% | +8.914% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.126% | +1.292% | +5.701% | +9.941% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 1.477% | +0.159% | +2.425% | +20.264% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.197% | +0.639% | +3.739% | +21.448% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.883% | -0.368% | +6.457% | +18.225% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 6.943% | -1.766% | +11.229% | +10.911% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.128% | -0.084% | +0.451% | +9.505% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.122% | -0.082% | +10.029% | +4.322% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.092% | -0.064% | +1.415% | +4.241% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.369% | +0.178% | +9.961% | +12.340% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.968% | -0.985% | -9.082% | +10.732% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.099% | +0.100% | +1.827% | +9.009% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 1.774% | -0.949% | -0.433% | +4.422% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 2.868% | -0.233% | +9.589% | +5.802% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.223% | -0.223% | +7.582% | +15.081% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 0.807% | -0.188% | +1.768% | -1.200% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 1.249% | +0.113% | +27.129% | +6.708% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.975% | -0.024% | +5.548% | +5.050% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.502% | +0.163% | +15.578% | +7.372% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 0.726% | +0.835% | +4.727% | -4.133% | +-----+------------------------+--------+------------+------------+------------+ | :-) | spectral_norm| 0.603% | +3.927% | +6.297% | -1.026% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.001% | +0.296% | +6.449% | +8.237% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.494% | +0.090% | +6.246% | +4.350% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 4.539% | +1.342% | +19.822% | +7.977% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.590% | -0.524% | +11.413% | +9.245% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.617% | -0.051% | +10.051% | +6.684% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.713% | -0.154% | +11.891% | +8.941% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 5.390% | +1.363% | +11.245% | +12.057% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.673% | +0.946% | +24.546% | +8.461% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.326% | +0.240% | +6.587% | +5.800% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.921% | -0.139% | +2.376% | -2.238% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 6.455% | +0.806% | +8.598% | +19.603% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 1.146% | -0.275% | -1.988% | +18.611% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 2.047% | -0.378% | +8.178% | +5.909% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.050% | +0.454% | +6.613% | +6.867% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.579% | +0.229% | +1.158% | +7.345% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 3.927% | +0.946% | -10.142% | +13.146% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.714% | -0.152% | +6.849% | +7.765% | +-----+------------------------+--------+------------+------------+------------+ * 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. [View Less]

1 0