Mailman 3 August 2017 - Python-checkins

[3.6] bpo-31243: Fixed PyArg_ParseTuple failure checks. (GH-3171) (#3233)
by Serhiy Storchaka 29 Aug '17

29 Aug '17

https://github.com/python/cpython/commit/c7750c2a3af014a5b742d0159d8957ea95… commit: c7750c2a3af014a5b742d0159d8957ea95b6c221 branch: 3.6 author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-29T15:43:32+03:00 summary: [3.6] bpo-31243: Fixed PyArg_ParseTuple failure checks. (GH-3171) (#3233) (cherry picked from commit ba7d7365215d791025d1efd25393c91404f2cfc8) files: A Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst M Lib/test/test_io.py M Modules/_io/textio.c M Modules/_testcapimodule.c diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 7057c927c3f..08c041ed937 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3191,6 +3191,26 @@ def _make_illegal_wrapper(): t = _make_illegal_wrapper() self.assertRaises(TypeError, t.read) + # Issue 31243: calling read() while the return value of decoder's + # getstate() is invalid should neither crash the interpreter nor + # raise a SystemError. + def _make_very_illegal_wrapper(getstate_ret_val): + class BadDecoder: + def getstate(self): + return getstate_ret_val + def _get_bad_decoder(dummy): + return BadDecoder() + quopri = codecs.lookup("quopri") + with support.swap_attr(quopri, 'incrementaldecoder', + _get_bad_decoder): + return _make_illegal_wrapper() + t = _make_very_illegal_wrapper(42) + self.assertRaises(TypeError, t.read, 42) + t = _make_very_illegal_wrapper(()) + self.assertRaises(TypeError, t.read, 42) + t = _make_very_illegal_wrapper((1, 2)) + self.assertRaises(TypeError, t.read, 42) + def _check_create_at_shutdown(self, **kwargs): # Issue #20037: creating a TextIOWrapper at shutdown # shouldn't crash the interpreter. diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst new file mode 100644 index 00000000000..166458f2b78 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst @@ -0,0 +1,2 @@ +Fix a crash in some methods of `io.TextIOWrapper`, when the decoder's state +is invalid. Patch by Oren Milman. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 801bb1745bb..588c6977691 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1457,15 +1457,23 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint) /* Given this, we know there was a valid snapshot point * len(dec_buffer) bytes ago with decoder state (b'', dec_flags). */ - if (PyArg_ParseTuple(state, "OO", &dec_buffer, &dec_flags) < 0) { + if (!PyTuple_Check(state)) { + PyErr_SetString(PyExc_TypeError, + "illegal decoder state"); + Py_DECREF(state); + return -1; + } + if (!PyArg_ParseTuple(state, + "OO;illegal decoder state", &dec_buffer, &dec_flags)) + { Py_DECREF(state); return -1; } if (!PyBytes_Check(dec_buffer)) { PyErr_Format(PyExc_TypeError, - "decoder getstate() should have returned a bytes " - "object, not '%.200s'", + "illegal decoder state: the first item should be a " + "bytes object, not '%.200s'", Py_TYPE(dec_buffer)->tp_name); Py_DECREF(state); return -1; @@ -2349,8 +2357,8 @@ _io_TextIOWrapper_tell_impl(textio *self) } \ if (!PyBytes_Check(dec_buffer)) { \ PyErr_Format(PyExc_TypeError, \ - "decoder getstate() should have returned a bytes " \ - "object, not '%.200s'", \ + "illegal decoder state: the first item should be a " \ + "bytes object, not '%.200s'", \ Py_TYPE(dec_buffer)->tp_name); \ Py_DECREF(_state); \ goto fail; \ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 91fac1573d3..ede675da285 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -870,8 +870,9 @@ test_L_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = -1; - if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) { return NULL; + } if (value != 42) return raiseTestError("test_L_code", "L code returned wrong value for long 42"); @@ -884,8 +885,9 @@ test_L_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = -1; - if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) { return NULL; + } if (value != 42) return raiseTestError("test_L_code", "L code returned wrong value for int 42"); @@ -1202,8 +1204,9 @@ test_k_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = 0; - if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) { return NULL; + } if (value != ULONG_MAX) return raiseTestError("test_k_code", "k code returned wrong value for long 0xFFF...FFF"); @@ -1221,8 +1224,9 @@ test_k_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = 0; - if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) { return NULL; + } if (value != (unsigned long)-0x42) return raiseTestError("test_k_code", "k code returned wrong value for long -0xFFF..000042"); @@ -1560,11 +1564,13 @@ test_s_code(PyObject *self) /* These two blocks used to raise a TypeError: * "argument must be string without null bytes, not str" */ - if (PyArg_ParseTuple(tuple, "s:test_s_code1", &value) < 0) - return NULL; + if (!PyArg_ParseTuple(tuple, "s:test_s_code1", &value)) { + return NULL; + } - if (PyArg_ParseTuple(tuple, "z:test_s_code2", &value) < 0) - return NULL; + if (!PyArg_ParseTuple(tuple, "z:test_s_code2", &value)) { + return NULL; + } Py_DECREF(tuple); Py_RETURN_NONE; @@ -1666,14 +1672,16 @@ test_u_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, obj); value = 0; - if (PyArg_ParseTuple(tuple, "u:test_u_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "u:test_u_code", &value)) { return NULL; + } if (value != PyUnicode_AS_UNICODE(obj)) return raiseTestError("test_u_code", "u code returned wrong value for u'test'"); value = 0; - if (PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len) < 0) + if (!PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len)) { return NULL; + } if (value != PyUnicode_AS_UNICODE(obj) || len != PyUnicode_GET_SIZE(obj)) return raiseTestError("test_u_code", @@ -1706,8 +1714,9 @@ test_Z_code(PyObject *self) value2 = PyUnicode_AS_UNICODE(obj); /* Test Z for both values */ - if (PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2) < 0) + if (!PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2)) { return NULL; + } if (value1 != PyUnicode_AS_UNICODE(obj)) return raiseTestError("test_Z_code", "Z code returned wrong value for 'test'"); @@ -1721,9 +1730,11 @@ test_Z_code(PyObject *self) len2 = -1; /* Test Z# for both values */ - if (PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1, - &value2, &len2) < 0) + if (!PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1, + &value2, &len2)) + { return NULL; + } if (value1 != PyUnicode_AS_UNICODE(obj) || len1 != PyUnicode_GET_SIZE(obj)) return raiseTestError("test_Z_code", @@ -2028,8 +2039,9 @@ test_empty_argparse(PyObject *self) tuple = PyTuple_New(0); if (!tuple) return NULL; - if ((result = PyArg_ParseTuple(tuple, "|:test_empty_argparse")) < 0) + if (!(result = PyArg_ParseTuple(tuple, "|:test_empty_argparse"))) { goto done; + } dict = PyDict_New(); if (!dict) goto done; @@ -2037,8 +2049,9 @@ test_empty_argparse(PyObject *self) done: Py_DECREF(tuple); Py_XDECREF(dict); - if (result < 0) + if (!result) { return NULL; + } else { Py_RETURN_NONE; } @@ -3573,8 +3586,9 @@ test_raise_signal(PyObject* self, PyObject *args) { int signum, err; - if (PyArg_ParseTuple(args, "i:raise_signal", &signum) < 0) + if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) { return NULL; + } err = raise(signum); if (err)

1 0

Daily reference leaks (4243df51fe43): sum=8
by solipsis＠pitrou.net 29 Aug '17

29 Aug '17

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

1 0

bpo-31243: Fixed PyArg_ParseTuple failure checks. (#3171)
by Serhiy Storchaka 29 Aug '17

29 Aug '17

https://github.com/python/cpython/commit/ba7d7365215d791025d1efd25393c91404… commit: ba7d7365215d791025d1efd25393c91404f2cfc8 branch: master author: Oren Milman <orenmn(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2017-08-29T11:58:27+03:00 summary: bpo-31243: Fixed PyArg_ParseTuple failure checks. (#3171) files: A Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst M Lib/test/test_io.py M Modules/_io/textio.c M Modules/_testcapimodule.c diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index ba95c1442fa..48270c88be6 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -3253,6 +3253,26 @@ def _make_illegal_wrapper(): t = _make_illegal_wrapper() self.assertRaises(TypeError, t.read) + # Issue 31243: calling read() while the return value of decoder's + # getstate() is invalid should neither crash the interpreter nor + # raise a SystemError. + def _make_very_illegal_wrapper(getstate_ret_val): + class BadDecoder: + def getstate(self): + return getstate_ret_val + def _get_bad_decoder(dummy): + return BadDecoder() + quopri = codecs.lookup("quopri") + with support.swap_attr(quopri, 'incrementaldecoder', + _get_bad_decoder): + return _make_illegal_wrapper() + t = _make_very_illegal_wrapper(42) + self.assertRaises(TypeError, t.read, 42) + t = _make_very_illegal_wrapper(()) + self.assertRaises(TypeError, t.read, 42) + t = _make_very_illegal_wrapper((1, 2)) + self.assertRaises(TypeError, t.read, 42) + def _check_create_at_shutdown(self, **kwargs): # Issue #20037: creating a TextIOWrapper at shutdown # shouldn't crash the interpreter. diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst new file mode 100644 index 00000000000..166458f2b78 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-08-24-13-34-49.bpo-31243.dRJzqR.rst @@ -0,0 +1,2 @@ +Fix a crash in some methods of `io.TextIOWrapper`, when the decoder's state +is invalid. Patch by Oren Milman. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 402f743c61f..9b7334d3b54 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1513,15 +1513,23 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint) /* Given this, we know there was a valid snapshot point * len(dec_buffer) bytes ago with decoder state (b'', dec_flags). */ - if (PyArg_ParseTuple(state, "OO", &dec_buffer, &dec_flags) < 0) { + if (!PyTuple_Check(state)) { + PyErr_SetString(PyExc_TypeError, + "illegal decoder state"); + Py_DECREF(state); + return -1; + } + if (!PyArg_ParseTuple(state, + "OO;illegal decoder state", &dec_buffer, &dec_flags)) + { Py_DECREF(state); return -1; } if (!PyBytes_Check(dec_buffer)) { PyErr_Format(PyExc_TypeError, - "decoder getstate() should have returned a bytes " - "object, not '%.200s'", + "illegal decoder state: the first item should be a " + "bytes object, not '%.200s'", Py_TYPE(dec_buffer)->tp_name); Py_DECREF(state); return -1; @@ -2408,8 +2416,8 @@ _io_TextIOWrapper_tell_impl(textio *self) } \ if (!PyBytes_Check(dec_buffer)) { \ PyErr_Format(PyExc_TypeError, \ - "decoder getstate() should have returned a bytes " \ - "object, not '%.200s'", \ + "illegal decoder state: the first item should be a " \ + "bytes object, not '%.200s'", \ Py_TYPE(dec_buffer)->tp_name); \ Py_DECREF(_state); \ goto fail; \ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 95c10184159..2952317e76d 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -864,8 +864,9 @@ test_L_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = -1; - if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) { return NULL; + } if (value != 42) return raiseTestError("test_L_code", "L code returned wrong value for long 42"); @@ -878,8 +879,9 @@ test_L_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = -1; - if (PyArg_ParseTuple(tuple, "L:test_L_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "L:test_L_code", &value)) { return NULL; + } if (value != 42) return raiseTestError("test_L_code", "L code returned wrong value for int 42"); @@ -1195,8 +1197,9 @@ test_k_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = 0; - if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) { return NULL; + } if (value != ULONG_MAX) return raiseTestError("test_k_code", "k code returned wrong value for long 0xFFF...FFF"); @@ -1215,8 +1218,9 @@ test_k_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, num); value = 0; - if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "k:test_k_code", &value)) { return NULL; + } if (value != (unsigned long)-0x42) return raiseTestError("test_k_code", "k code returned wrong value for long -0xFFF..000042"); @@ -1549,11 +1553,13 @@ test_s_code(PyObject *self) /* These two blocks used to raise a TypeError: * "argument must be string without null bytes, not str" */ - if (PyArg_ParseTuple(tuple, "s:test_s_code1", &value) < 0) - return NULL; + if (!PyArg_ParseTuple(tuple, "s:test_s_code1", &value)) { + return NULL; + } - if (PyArg_ParseTuple(tuple, "z:test_s_code2", &value) < 0) - return NULL; + if (!PyArg_ParseTuple(tuple, "z:test_s_code2", &value)) { + return NULL; + } Py_DECREF(tuple); Py_RETURN_NONE; @@ -1655,14 +1661,16 @@ test_u_code(PyObject *self) PyTuple_SET_ITEM(tuple, 0, obj); value = 0; - if (PyArg_ParseTuple(tuple, "u:test_u_code", &value) < 0) + if (!PyArg_ParseTuple(tuple, "u:test_u_code", &value)) { return NULL; + } if (value != PyUnicode_AS_UNICODE(obj)) return raiseTestError("test_u_code", "u code returned wrong value for u'test'"); value = 0; - if (PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len) < 0) + if (!PyArg_ParseTuple(tuple, "u#:test_u_code", &value, &len)) { return NULL; + } if (value != PyUnicode_AS_UNICODE(obj) || len != PyUnicode_GET_SIZE(obj)) return raiseTestError("test_u_code", @@ -1694,8 +1702,9 @@ test_Z_code(PyObject *self) value2 = PyUnicode_AS_UNICODE(obj); /* Test Z for both values */ - if (PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2) < 0) + if (!PyArg_ParseTuple(tuple, "ZZ:test_Z_code", &value1, &value2)) { return NULL; + } if (value1 != PyUnicode_AS_UNICODE(obj)) return raiseTestError("test_Z_code", "Z code returned wrong value for 'test'"); @@ -1709,9 +1718,11 @@ test_Z_code(PyObject *self) len2 = -1; /* Test Z# for both values */ - if (PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1, - &value2, &len2) < 0) + if (!PyArg_ParseTuple(tuple, "Z#Z#:test_Z_code", &value1, &len1, + &value2, &len2)) + { return NULL; + } if (value1 != PyUnicode_AS_UNICODE(obj) || len1 != PyUnicode_GET_SIZE(obj)) return raiseTestError("test_Z_code", @@ -2033,8 +2044,9 @@ test_empty_argparse(PyObject *self) tuple = PyTuple_New(0); if (!tuple) return NULL; - if ((result = PyArg_ParseTuple(tuple, "|:test_empty_argparse")) < 0) + if (!(result = PyArg_ParseTuple(tuple, "|:test_empty_argparse"))) { goto done; + } dict = PyDict_New(); if (!dict) goto done; @@ -2042,8 +2054,9 @@ test_empty_argparse(PyObject *self) done: Py_DECREF(tuple); Py_XDECREF(dict); - if (result < 0) + if (!result) { return NULL; + } else { Py_RETURN_NONE; } @@ -3698,8 +3711,9 @@ test_raise_signal(PyObject* self, PyObject *args) { int signum, err; - if (PyArg_ParseTuple(args, "i:raise_signal", &signum) < 0) + if (!PyArg_ParseTuple(args, "i:raise_signal", &signum)) { return NULL; + } err = raise(signum); if (err)

1 0

[65 flat] Results for Python (master branch) 2017-08-28
by lp_benchmark_robot＠intel.com 28 Aug '17

28 Aug '17

Results for project python/master, build date: 2017-08-28 03:04:26-07:00. - commit: a30f6d4 - previous commit: a3a6df3 - revision date: 2017-08-28 10:32:44+02: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.103% | -0.086% | +3.212% | +8.151% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.646% | -1.848% | +22.948% | +9.529% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 0.853% | -1.144% | +23.850% | +8.296% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.543% | -1.331% | +22.061% | +8.033% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 2.526% | +0.740% | +2.954% | +16.849% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.641% | +0.450% | +11.860% | +7.447% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 0.942% | +0.235% | +5.901% | +9.293% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.583% | -0.431% | +3.204% | +5.955% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 4.124% | +0.231% | +6.467% | +19.317% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.790% | -2.140% | +4.727% | +16.331% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.146% | -0.479% | +3.244% | +8.244% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 2.058% | -0.351% | +5.015% | +3.450% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 0.710% | -0.009% | +3.494% | +6.087% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.471% | -0.437% | +7.755% | +11.580% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.804% | -0.924% | +5.241% | +9.555% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 0.688% | -0.113% | +6.171% | +10.819% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.496% | +0.733% | +9.425% | +10.816% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 3.420% | -2.011% | +4.744% | +12.947% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 2.540% | -1.525% | +3.460% | +9.889% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 4.819% | -0.206% | +1.114% | +11.089% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.647% | -0.980% | +4.355% | +12.401% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.280% | -0.219% | +46.754% | +11.515% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.727% | -2.651% | +5.076% | +13.817% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.691% | -0.486% | +19.003% | +10.964% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 6.200% | +0.826% | +5.666% | +13.583% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.846% | +0.545% | +4.421% | +4.326% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.974% | +0.583% | -3.915% | +6.609% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.535% | +1.327% | +3.084% | +5.926% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.311% | -3.296% | -0.566% | +13.762% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 2.126% | -0.515% | -0.653% | +24.779% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.165% | +0.854% | +2.487% | +18.406% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.865% | +0.360% | +6.628% | +17.938% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 6.455% | -2.035% | +9.922% | +10.475% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.384% | -0.051% | +0.347% | +10.109% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.149% | -0.230% | +8.237% | +5.558% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.102% | -0.182% | +0.355% | +5.163% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.241% | -0.391% | +8.286% | +12.425% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.608% | -1.237% | -8.398% | +10.135% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 1.345% | +0.496% | +2.249% | +8.644% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.166% | +0.044% | +0.267% | +0.686% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 0.623% | +0.920% | +11.985% | +4.325% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 2.594% | -0.615% | +7.387% | +14.573% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 1.470% | +0.270% | +1.068% | +3.857% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 2.258% | -1.674% | +25.528% | +10.676% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.275% | -2.086% | +3.097% | +7.086% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 0.798% | -0.562% | +14.366% | +7.368% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 0.436% | +0.444% | +1.086% | +1.227% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.673% | -0.299% | +5.317% | +3.214% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.449% | -0.454% | +4.434% | +6.923% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 2.983% | -0.277% | +4.343% | +6.475% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 3.611% | -4.183% | -5.067% | +15.390% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 2.240% | -0.448% | +11.291% | +8.149% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.441% | -0.830% | +9.296% | +7.239% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.832% | -0.100% | +11.078% | +9.484% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 4.407% | -1.833% | +11.797% | +9.417% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 4.583% | -2.424% | +20.938% | +10.012% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 1.032% | -0.862% | +4.735% | +6.139% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 0.801% | +0.459% | +2.744% | -0.410% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 7.237% | +1.946% | +9.076% | +20.647% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 0.986% | -0.580% | -2.609% | +19.161% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 1.342% | +0.477% | +6.363% | +6.394% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.236% | +0.364% | +5.938% | +8.433% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 2.174% | +1.224% | +3.499% | +4.845% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 1.080% | +0.847% | -4.323% | +8.926% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 1.302% | -0.333% | +6.741% | +8.649% | +-----+------------------------+--------+------------+------------+------------+ * 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

Fix a typo in the Programming FAQ. (#3230)
by Gregory P. Smith 28 Aug '17

28 Aug '17

https://github.com/python/cpython/commit/e9d978fd1bc122395efc91a82b16b2c4b9… commit: e9d978fd1bc122395efc91a82b16b2c4b968441d branch: master author: Gregory P. Smith <greg(a)krypto.org> committer: GitHub <noreply(a)github.com> date: 2017-08-28T13:43:26-07:00 summary: Fix a typo in the Programming FAQ. (#3230) subobjects, not subobjecs. files: M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index d9bdb21e79a..1022373d387 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1638,7 +1638,7 @@ collected. Despite the cycle collector, it's still a good idea to define an explicit ``close()`` method on objects to be called whenever you're done with them. The -``close()`` method can then remove attributes that refer to subobjecs. Don't +``close()`` method can then remove attributes that refer to subobjects. Don't call :meth:`__del__` directly -- :meth:`__del__` should call ``close()`` and ``close()`` should make sure that it can be called more than once for the same object.

1 0

bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (#31)
by Antoine Pitrou 28 Aug '17

28 Aug '17

https://github.com/python/cpython/commit/07f1658aa09f6798793c473c72b2951b7f… commit: 07f1658aa09f6798793c473c72b2951b7fefe220 branch: master author: Pauli Virtanen <pav(a)iki.fi> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2017-08-28T14:08:49+02:00 summary: bpo-10746: Fix ctypes PEP 3118 type codes for c_long, c_bool, c_int (#31) Ctypes currently produces wrong pep3118 type codes for several types. E.g. memoryview(ctypes.c_long()).format gives "<l" on 64-bit platforms, but it should be "<q" instead for sizeof(c_long) == 8 The problem is that the '<>' endian specification in the struct syntax also turns on the "standard size" mode, which makes type characters have a platform-independent meaning, which does not match with the codes used internally in ctypes. The struct module format syntax also does not allow specifying native-size non-native-endian items. This commit adds a converter function that maps the internal ctypes codes to appropriate struct module standard-size codes in the pep3118 format strings. The tests are modified to check for this. files: A Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst M Lib/ctypes/test/test_pep3118.py M Modules/_ctypes/_ctypes.c diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py index d68397ea802..f3c0e23e53e 100644 --- a/Lib/ctypes/test/test_pep3118.py +++ b/Lib/ctypes/test/test_pep3118.py @@ -112,6 +112,34 @@ class Complete(Structure): # This table contains format strings as they look on little endian # machines. The test replaces '<' with '>' on big endian machines. # + +# Platform-specific type codes +s_bool = {1: '?', 2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_bool)] +s_short = {2: 'h', 4: 'l', 8: 'q'}[sizeof(c_short)] +s_ushort = {2: 'H', 4: 'L', 8: 'Q'}[sizeof(c_ushort)] +s_int = {2: 'h', 4: 'i', 8: 'q'}[sizeof(c_int)] +s_uint = {2: 'H', 4: 'I', 8: 'Q'}[sizeof(c_uint)] +s_long = {4: 'l', 8: 'q'}[sizeof(c_long)] +s_ulong = {4: 'L', 8: 'Q'}[sizeof(c_ulong)] +s_longlong = "q" +s_ulonglong = "Q" +s_float = "f" +s_double = "d" +s_longdouble = "g" + +# Alias definitions in ctypes/__init__.py +if c_int is c_long: + s_int = s_long +if c_uint is c_ulong: + s_uint = s_ulong +if c_longlong is c_long: + s_longlong = s_long +if c_ulonglong is c_ulong: + s_ulonglong = s_ulong +if c_longdouble is c_double: + s_longdouble = s_double + + native_types = [ # type format shape calc itemsize @@ -120,52 +148,51 @@ class Complete(Structure): (c_char, "<c", (), c_char), (c_byte, "<b", (), c_byte), (c_ubyte, "<B", (), c_ubyte), - (c_short, "<h", (), c_short), - (c_ushort, "<H", (), c_ushort), + (c_short, "<" + s_short, (), c_short), + (c_ushort, "<" + s_ushort, (), c_ushort), - # c_int and c_uint may be aliases to c_long - #(c_int, "<i", (), c_int), - #(c_uint, "<I", (), c_uint), + (c_int, "<" + s_int, (), c_int), + (c_uint, "<" + s_uint, (), c_uint), - (c_long, "<l", (), c_long), - (c_ulong, "<L", (), c_ulong), + (c_long, "<" + s_long, (), c_long), + (c_ulong, "<" + s_ulong, (), c_ulong), - # c_longlong and c_ulonglong are aliases on 64-bit platforms - #(c_longlong, "<q", None, c_longlong), - #(c_ulonglong, "<Q", None, c_ulonglong), + (c_longlong, "<" + s_longlong, (), c_longlong), + (c_ulonglong, "<" + s_ulonglong, (), c_ulonglong), (c_float, "<f", (), c_float), (c_double, "<d", (), c_double), - # c_longdouble may be an alias to c_double - (c_bool, "<?", (), c_bool), + (c_longdouble, "<" + s_longdouble, (), c_longdouble), + + (c_bool, "<" + s_bool, (), c_bool), (py_object, "<O", (), py_object), ## pointers (POINTER(c_byte), "&<b", (), POINTER(c_byte)), - (POINTER(POINTER(c_long)), "&&<l", (), POINTER(POINTER(c_long))), + (POINTER(POINTER(c_long)), "&&<" + s_long, (), POINTER(POINTER(c_long))), ## arrays and pointers (c_double * 4, "<d", (4,), c_double), (c_float * 4 * 3 * 2, "<f", (2,3,4), c_float), - (POINTER(c_short) * 2, "&<h", (2,), POINTER(c_short)), - (POINTER(c_short) * 2 * 3, "&<h", (3,2,), POINTER(c_short)), - (POINTER(c_short * 2), "&(2)<h", (), POINTER(c_short)), + (POINTER(c_short) * 2, "&<" + s_short, (2,), POINTER(c_short)), + (POINTER(c_short) * 2 * 3, "&<" + s_short, (3,2,), POINTER(c_short)), + (POINTER(c_short * 2), "&(2)<" + s_short, (), POINTER(c_short)), ## structures and unions - (Point, "T{<l:x:<l:y:}", (), Point), + (Point, "T{<l:x:<l:y:}".replace('l', s_long), (), Point), # packed structures do not implement the pep - (PackedPoint, "B", (), PackedPoint), - (Point2, "T{<l:x:<l:y:}", (), Point2), - (EmptyStruct, "T{}", (), EmptyStruct), + (PackedPoint, "B", (), PackedPoint), + (Point2, "T{<l:x:<l:y:}".replace('l', s_long), (), Point2), + (EmptyStruct, "T{}", (), EmptyStruct), # the pep does't support unions - (aUnion, "B", (), aUnion), + (aUnion, "B", (), aUnion), # structure with sub-arrays - (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (), StructWithArrays), - (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}", (3,), StructWithArrays), + (StructWithArrays, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (), StructWithArrays), + (StructWithArrays * 3, "T{(2,3)<l:x:(4)T{<l:x:<l:y:}:y:}".replace('l', s_long), (3,), StructWithArrays), ## pointer to incomplete structure (Incomplete, "B", (), Incomplete), @@ -173,7 +200,7 @@ class Complete(Structure): # 'Complete' is a structure that starts incomplete, but is completed after the # pointer type to it has been created. - (Complete, "T{<l:a:}", (), Complete), + (Complete, "T{<l:a:}".replace('l', s_long), (), Complete), # Unfortunately the pointer format string is not fixed... (POINTER(Complete), "&B", (), POINTER(Complete)), @@ -196,10 +223,10 @@ class LEPoint(LittleEndianStructure): # and little endian machines. # endian_types = [ - (BEPoint, "T{>l:x:>l:y:}", (), BEPoint), - (LEPoint, "T{<l:x:<l:y:}", (), LEPoint), - (POINTER(BEPoint), "&T{>l:x:>l:y:}", (), POINTER(BEPoint)), - (POINTER(LEPoint), "&T{<l:x:<l:y:}", (), POINTER(LEPoint)), + (BEPoint, "T{>l:x:>l:y:}".replace('l', s_long), (), BEPoint), + (LEPoint, "T{<l:x:<l:y:}".replace('l', s_long), (), LEPoint), + (POINTER(BEPoint), "&T{>l:x:>l:y:}".replace('l', s_long), (), POINTER(BEPoint)), + (POINTER(LEPoint), "&T{<l:x:<l:y:}".replace('l', s_long), (), POINTER(LEPoint)), ] if __name__ == "__main__": diff --git a/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst new file mode 100644 index 00000000000..e7625631002 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-08-28-13-01-05.bpo-10746.nmAvfu.rst @@ -0,0 +1 @@ +Fix ctypes producing wrong PEP 3118 type codes for integer types. diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 0bcfc13ad02..0255f76b8a0 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -249,6 +249,71 @@ PyDict_GetItemProxy(PyObject *dict, PyObject *key) } /******************************************************************/ + +/* + Allocate a memory block for a pep3118 format string, filled with + a suitable PEP 3118 type code corresponding to the given ctypes + type. Returns NULL on failure, with the error indicator set. + + This produces type codes in the standard size mode (cf. struct module), + since the endianness may need to be swapped to a non-native one + later on. + */ +static char * +_ctypes_alloc_format_string_for_type(char code, int big_endian) +{ + char *result; + char pep_code = '\0'; + + switch (code) { +#if SIZEOF_INT == 2 + case 'i': pep_code = 'h'; break; + case 'I': pep_code = 'H'; break; +#elif SIZEOF_INT == 4 + case 'i': pep_code = 'i'; break; + case 'I': pep_code = 'I'; break; +#elif SIZEOF_INT == 8 + case 'i': pep_code = 'q'; break; + case 'I': pep_code = 'Q'; break; +#else +# error SIZEOF_INT has an unexpected value +#endif /* SIZEOF_INT */ +#if SIZEOF_LONG == 4 + case 'l': pep_code = 'l'; break; + case 'L': pep_code = 'L'; break; +#elif SIZEOF_LONG == 8 + case 'l': pep_code = 'q'; break; + case 'L': pep_code = 'Q'; break; +#else +# error SIZEOF_LONG has an unexpected value +#endif /* SIZEOF_LONG */ +#if SIZEOF__BOOL == 1 + case '?': pep_code = '?'; break; +#elif SIZEOF__BOOL == 2 + case '?': pep_code = 'H'; break; +#elif SIZEOF__BOOL == 4 + case '?': pep_code = 'L'; break; +#elif SIZEOF__BOOL == 8 + case '?': pep_code = 'Q'; break; +#else +# error SIZEOF__BOOL has an unexpected value +#endif /* SIZEOF__BOOL */ + default: + /* The standard-size code is the same as the ctypes one */ + pep_code = code; + break; + } + + result = PyMem_Malloc(3); + if (result == NULL) + return NULL; + + result[0] = big_endian ? '>' : '<'; + result[1] = pep_code; + result[2] = '\0'; + return result; +} + /* Allocate a memory block for a pep3118 format string, copy prefix (if non-null) and suffix into it. Returns NULL on failure, with the error @@ -1930,9 +1995,9 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) stgdict->setfunc = fmt->setfunc; stgdict->getfunc = fmt->getfunc; #ifdef WORDS_BIGENDIAN - stgdict->format = _ctypes_alloc_format_string(">", proto_str); + stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 1); #else - stgdict->format = _ctypes_alloc_format_string("<", proto_str); + stgdict->format = _ctypes_alloc_format_string_for_type(proto_str[0], 0); #endif if (stgdict->format == NULL) { Py_DECREF(result);

1 0

Daily reference leaks (4243df51fe43): sum=8
by solipsis＠pitrou.net 28 Aug '17

28 Aug '17

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

1 0

bpo-30987 - Support for ISO-TP protocol in SocketCAN (#2956)
by Christian Heimes 28 Aug '17

28 Aug '17

https://github.com/python/cpython/commit/a30f6d45ac3e72761b96a8df0527182029… commit: a30f6d45ac3e72761b96a8df0527182029eaee24 branch: master author: Pier-Yves Lessard <py.lessard(a)gmail.com> committer: Christian Heimes <christian(a)python.org> date: 2017-08-28T10:32:44+02:00 summary: bpo-30987 - Support for ISO-TP protocol in SocketCAN (#2956) * Added support for CAN_ISOTP protocol * Added unit tests for CAN ISOTP * Updated documentation for ISO-TP protocol * Removed trailing whitespace in documentation * Added blurb NEWS.d file * updated Misc/ACKS * Fixed broken unit test that was using isotp const outside of skippable section * Removed dependecy over third party project * Added implementation for getsockname + unit tests * Missing newline at end of ACKS file * Accidentally inserted a type in ACKS file * Followed tiran changes review #1 recommendations * Added spaces after comma files: A Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst M Doc/library/socket.rst M Lib/test/test_socket.py M Misc/ACKS M Modules/socketmodule.c diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index 8af6bc5439b..c5064e92c21 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -103,6 +103,10 @@ created. Socket addresses are represented as follows: ``'can0'``. The network interface name ``''`` can be used to receive packets from all network interfaces of this family. + - :const:`CAN_ISOTP` protocol require a tuple ``(interface, rx_addr, tx_addr)`` + where both additional parameters are unsigned long integer that represent a + CAN identifier (standard or extended). + - A string or a tuple ``(id, unit)`` is used for the :const:`SYSPROTO_CONTROL` protocol of the :const:`PF_SYSTEM` family. The string is the name of a kernel control using a dynamically-assigned ID. The tuple can be used if ID @@ -341,6 +345,16 @@ Constants .. versionadded:: 3.5 +.. data:: CAN_ISOTP + + CAN_ISOTP, in the CAN protocol family, is the ISO-TP (ISO 15765-2) protocol. + ISO-TP constants, documented in the Linux documentation. + + Availability: Linux >= 2.6.25 + + .. versionadded:: 3.7 + + .. data:: AF_RDS PF_RDS SOL_RDS @@ -427,7 +441,7 @@ The following functions all create :ref:`socket objects <socket-objects>`. :const:`SOCK_DGRAM`, :const:`SOCK_RAW` or perhaps one of the other ``SOCK_`` constants. The protocol number is usually zero and may be omitted or in the case where the address family is :const:`AF_CAN` the protocol should be one - of :const:`CAN_RAW` or :const:`CAN_BCM`. If *fileno* is specified, the other + of :const:`CAN_RAW`, :const:`CAN_BCM` or :const:`CAN_ISOTP`. If *fileno* is specified, the other arguments are ignored, causing the socket with the specified file descriptor to return. Unlike :func:`socket.fromfd`, *fileno* will return the same socket and not a duplicate. This may help close a detached socket using @@ -445,6 +459,8 @@ The following functions all create :ref:`socket objects <socket-objects>`. .. versionchanged:: 3.4 The returned socket is now non-inheritable. + .. versionchanged:: 3.7 + The CAN_ISOTP protocol was added. .. function:: socketpair([family[, type[, proto]]]) @@ -1661,7 +1677,7 @@ the interface:: # disabled promiscuous mode s.ioctl(socket.SIO_RCVALL, socket.RCVALL_OFF) -The last example shows how to use the socket interface to communicate to a CAN +The next example shows how to use the socket interface to communicate to a CAN network using the raw socket protocol. To use CAN with the broadcast manager protocol instead, open a socket with:: @@ -1671,7 +1687,7 @@ After binding (:const:`CAN_RAW`) or connecting (:const:`CAN_BCM`) the socket, yo can use the :meth:`socket.send`, and the :meth:`socket.recv` operations (and their counterparts) on the socket object as usual. -This example might require special privileges:: +This last example might require special privileges:: import socket import struct diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index f28f7d6816e..84234887747 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -55,6 +55,16 @@ def _have_socket_can(): s.close() return True +def _have_socket_can_isotp(): + """Check whether CAN ISOTP sockets are supported on this host.""" + try: + s = socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) + except (AttributeError, OSError): + return False + else: + s.close() + return True + def _have_socket_rds(): """Check whether RDS sockets are supported on this host.""" try: @@ -77,6 +87,8 @@ def _have_socket_alg(): HAVE_SOCKET_CAN = _have_socket_can() +HAVE_SOCKET_CAN_ISOTP = _have_socket_can_isotp() + HAVE_SOCKET_RDS = _have_socket_rds() HAVE_SOCKET_ALG = _have_socket_alg() @@ -1709,6 +1721,49 @@ def testBCM(self): self.assertEqual(bytes_sent, len(header_plus_frame)) +(a)unittest.skipUnless(HAVE_SOCKET_CAN_ISOTP, 'CAN ISOTP required for this test.') +class ISOTPTest(unittest.TestCase): + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.interface = "vcan0" + + def testCrucialConstants(self): + socket.AF_CAN + socket.PF_CAN + socket.CAN_ISOTP + socket.SOCK_DGRAM + + def testCreateSocket(self): + with socket.socket(socket.PF_CAN, socket.SOCK_RAW, socket.CAN_RAW) as s: + pass + + @unittest.skipUnless(hasattr(socket, "CAN_ISOTP"), + 'socket.CAN_ISOTP required for this test.') + def testCreateISOTPSocket(self): + with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s: + pass + + def testTooLongInterfaceName(self): + # most systems limit IFNAMSIZ to 16, take 1024 to be sure + with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s: + with self.assertRaisesRegex(OSError, 'interface name too long'): + s.bind(('x' * 1024, 1, 2)) + + def testBind(self): + try: + with socket.socket(socket.PF_CAN, socket.SOCK_DGRAM, socket.CAN_ISOTP) as s: + addr = self.interface, 0x123, 0x456 + s.bind(addr) + self.assertEqual(s.getsockname(), addr) + except OSError as e: + if e.errno == errno.ENODEV: + self.skipTest('network interface `%s` does not exist' % + self.interface) + else: + raise + + @unittest.skipUnless(HAVE_SOCKET_RDS, 'RDS sockets required for this test.') class BasicRDSTest(unittest.TestCase): diff --git a/Misc/ACKS b/Misc/ACKS index b2e05920489..91e04246f73 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -908,6 +908,7 @@ John Lenton Kostyantyn Leschenko Benno Leslie Christopher Tur Lesniewski-Laas +Pier-Yves Lessard Alain Leufroy Mark Levinson Mark Levitt diff --git a/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst b/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst new file mode 100644 index 00000000000..de30ea8850c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-07-30-22-00-12.bpo-30987.228rW0.rst @@ -0,0 +1 @@ +Added support for CAN ISO-TP protocol in the socket module. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index bf8d19fe2f4..beadecfad50 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1373,9 +1373,22 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto) ifname = ifr.ifr_name; } - return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault, - ifname, - a->can_family); + switch (proto) { +#ifdef CAN_ISOTP + case CAN_ISOTP: + { + return Py_BuildValue("O&kk", PyUnicode_DecodeFSDefault, + ifname, + a->can_addr.tp.rx_id, + a->can_addr.tp.tx_id); + } +#endif + default: + { + return Py_BuildValue("O&", PyUnicode_DecodeFSDefault, + ifname); + } + } } #endif @@ -1869,7 +1882,9 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, } #endif -#if defined(AF_CAN) && defined(CAN_RAW) && defined(CAN_BCM) +#ifdef AF_CAN + +#if defined(CAN_RAW) && defined(CAN_BCM) case AF_CAN: switch (s->sock_proto) { case CAN_RAW: @@ -1880,7 +1895,6 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, PyObject *interfaceName; struct ifreq ifr; Py_ssize_t len; - addr = (struct sockaddr_can *)addr_ret; if (!PyArg_ParseTuple(args, "O&", PyUnicode_FSConverter, @@ -1913,6 +1927,54 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, Py_DECREF(interfaceName); return 1; } +#endif + +#ifdef CAN_ISOTP + case CAN_ISOTP: + { + struct sockaddr_can *addr; + PyObject *interfaceName; + struct ifreq ifr; + Py_ssize_t len; + unsigned long int rx_id, tx_id; + + addr = (struct sockaddr_can *)addr_ret; + + if (!PyArg_ParseTuple(args, "O&kk", PyUnicode_FSConverter, + &interfaceName, + &rx_id, + &tx_id)) + return 0; + + len = PyBytes_GET_SIZE(interfaceName); + + if (len == 0) { + ifr.ifr_ifindex = 0; + } else if ((size_t)len < sizeof(ifr.ifr_name)) { + strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name)); + ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0'; + if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) { + s->errorhandler(); + Py_DECREF(interfaceName); + return 0; + } + } else { + PyErr_SetString(PyExc_OSError, + "AF_CAN interface name too long"); + Py_DECREF(interfaceName); + return 0; + } + + addr->can_family = AF_CAN; + addr->can_ifindex = ifr.ifr_ifindex; + addr->can_addr.tp.rx_id = rx_id; + addr->can_addr.tp.tx_id = tx_id; + + *len_ret = sizeof(*addr); + Py_DECREF(interfaceName); + return 1; + } +#endif default: PyErr_SetString(PyExc_OSError, "getsockaddrarg: unsupported CAN protocol"); @@ -6995,6 +7057,9 @@ PyInit__socket(void) PyModule_AddIntMacro(m, CAN_SFF_MASK); PyModule_AddIntMacro(m, CAN_EFF_MASK); PyModule_AddIntMacro(m, CAN_ERR_MASK); +#ifdef CAN_ISOTP + PyModule_AddIntMacro(m, CAN_ISOTP); +#endif #endif #ifdef HAVE_LINUX_CAN_RAW_H PyModule_AddIntMacro(m, CAN_RAW_FILTER);

1 0

[3.6] bpo-26656: Improve re.compile documentation (GH-3211) (GH-3225)
by Mariatta 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/83e5c888fff2bf3663952b2bfd3a3ee6c2… commit: 83e5c888fff2bf3663952b2bfd3a3ee6c20386ef branch: 3.6 author: Mariatta <Mariatta(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2017-08-27T22:50:08-07:00 summary: [3.6] bpo-26656: Improve re.compile documentation (GH-3211) (GH-3225) - Link to the regular expressions object documentation - Clarify that it can be used with more than the two methods currently stated. (cherry picked from commit ed94a8b2851914bcda3a77b28b25517b8baa91e6) files: M Doc/library/re.rst diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 5ae304d25e1..7a51abdc983 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -490,9 +490,10 @@ form. .. function:: compile(pattern, flags=0) - Compile a regular expression pattern into a regular expression object, which - can be used for matching using its :func:`~regex.match` and - :func:`~regex.search` methods, described below. + Compile a regular expression pattern into a :ref:`regular expression object + <re-objects>`, which can be used for matching using its + :func:`~regex.match`, :func:`~regex.search` and other methods, described + below. The expression's behaviour can be modified by specifying a *flags* value. Values can be any of the following variables, combined using bitwise OR (the

1 0

bpo-26656: Improve re.compile documentation (GH-3211)
by Mariatta 27 Aug '17

27 Aug '17

https://github.com/python/cpython/commit/ed94a8b2851914bcda3a77b28b25517b8b… commit: ed94a8b2851914bcda3a77b28b25517b8baa91e6 branch: master author: Henk-Jaap Wagenaar <wagenaarhenkjaap(a)gmail.com> committer: Mariatta <Mariatta(a)users.noreply.github.com> date: 2017-08-27T22:41:20-07:00 summary: bpo-26656: Improve re.compile documentation (GH-3211) - Link to the regular expressions object documentation - Clarify that it can be used with more than the two methods currently stated. files: M Doc/library/re.rst diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 0b9d9755f30..138e7d87996 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -490,9 +490,10 @@ form. .. function:: compile(pattern, flags=0) - Compile a regular expression pattern into a regular expression object, which - can be used for matching using its :func:`~regex.match` and - :func:`~regex.search` methods, described below. + Compile a regular expression pattern into a :ref:`regular expression object + <re-objects>`, which can be used for matching using its + :func:`~regex.match`, :func:`~regex.search` and other methods, described + below. The expression's behaviour can be modified by specifying a *flags* value. Values can be any of the following variables, combined using bitwise OR (the

1 0