Mailman 3 January 2017 - Python-checkins

cpython (merge 3.6 -> default): Issue #27867: Function PySlice_GetIndicesEx() is deprecated and replaced with
by serhiy.storchaka Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/6093ce8eed6c changeset: 106314:6093ce8eed6c parent: 106310:0fd4a3d8e32a parent: 106313:b4457fe7fdb8 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Jan 25 13:27:44 2017 +0200 summary: Issue #27867: Function PySlice_GetIndicesEx() is deprecated and replaced with a macro if Py_LIMITED_API is not set or set to the value between 0x03050400 and 0x03060000 (not including) or 0x03060100 or higher. Added functions PySlice_Unpack() and PySlice_AdjustIndices(). files: Doc/c-api/slice.rst | 37 ++++++++++++++ Doc/whatsnew/3.7.rst | 7 ++ Include/sliceobject.h | 16 +++++- Misc/NEWS | 5 + Objects/sliceobject.c | 78 +++++++++++++++++++++--------- PC/python3.def | 2 + 6 files changed, 119 insertions(+), 26 deletions(-) diff --git a/Doc/c-api/slice.rst b/Doc/c-api/slice.rst --- a/Doc/c-api/slice.rst +++ b/Doc/c-api/slice.rst @@ -56,3 +56,40 @@ .. versionchanged:: 3.2 The parameter type for the *slice* parameter was ``PySliceObject*`` before. + + .. versionchanged:: 3.6.1 + If ``Py_LIMITED_API`` is not set or set to the value between ``0x03050400`` + and ``0x03060000`` (not including) or ``0x03060100`` or higher + :c:func:`!PySlice_GetIndicesEx` is implemented as a macro using + :c:func:`PySlice_Unpack` and :c:func:`PySlice_AdjustIndices`. + Arguments *start*, *stop* and *step* are evaluated more than once. + + .. deprecated:: 3.6.1 + If ``Py_LIMITED_API`` is set to the value less than ``0x03050400`` or + between ``0x03060000`` and ``0x03060100`` (not including) + :c:func:`!PySlice_GetIndicesEx` is a deprecated function. + + +.. c:function:: int PySlice_Unpack(PyObject *slice, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) + + Extract the start, stop and step data members from a slice object as + C integers. Silently reduce values larger than ``PY_SSIZE_T_MAX`` to + ``PY_SSIZE_T_MAX``, silently boost the start and stop values less than + ``-PY_SSIZE_T_MAX-1`` to ``-PY_SSIZE_T_MAX-1``, and silently boost the step + values less than ``-PY_SSIZE_T_MAX`` to ``-PY_SSIZE_T_MAX``. + + Return ``-1`` on error, ``0`` on success. + + .. versionadded:: 3.6.1 + + +.. c:function:: Py_ssize_t PySlice_AdjustIndices(Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step) + + Adjust start/end slice indices assuming a sequence of the specified length. + Out of bounds indices are clipped in a manner consistent with the handling + of normal slices. + + Return the length of the slice. Always successful. Doesn't call Python + code. + + .. versionadded:: 3.6.1 diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -128,10 +128,17 @@ is now of type ``const char *`` rather of ``char *``. (Contributed by Serhiy Storchaka in :issue:`28769`.) +* Added functions :c:func:`PySlice_Unpack` and :c:func:`PySlice_AdjustIndices`. + (Contributed by Serhiy Storchaka in :issue:`27867`.) + Deprecated ========== +- Function :c:func:`PySlice_GetIndicesEx` is deprecated and replaced with + a macro if ``Py_LIMITED_API`` is not set or set to the value between + ``0x03050400`` and ``0x03060000`` (not including) or ``0x03060100`` or + higher. (Contributed by Serhiy Storchaka in :issue:`27867`.) Removed diff --git a/Include/sliceobject.h b/Include/sliceobject.h --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,8 +41,20 @@ PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t *step, Py_ssize_t *slicelength) Py_DEPRECATED(3.7); + +#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 +#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ + PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? -1 : \ + ((*slicelen = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ + 0)) +PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); +PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t step); +#endif #ifdef __cplusplus } diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -623,6 +623,11 @@ C API ----- +- Issue #27867: Function PySlice_GetIndicesEx() is deprecated and replaced with + a macro if Py_LIMITED_API is not set or set to the value between 0x03050400 + and 0x03060000 (not including) or 0x03060100 or higher. Added functions + PySlice_Unpack() and PySlice_AdjustIndices(). + - Issue #29083: Fixed the declaration of some public API functions. PyArg_VaParse() and PyArg_VaParseTupleAndKeywords() were not available in limited API. PyArg_ValidateKeywordArguments(), PyArg_UnpackTuple() and diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -191,15 +191,12 @@ } int -PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, - Py_ssize_t *slicelength) +PySlice_Unpack(PyObject *_r, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) { PySliceObject *r = (PySliceObject*)_r; /* this is harder to get right than you might think */ - Py_ssize_t defstart, defstop; - if (r->step == Py_None) { *step = 1; } @@ -219,42 +216,75 @@ *step = -PY_SSIZE_T_MAX; } - defstart = *step < 0 ? length-1 : 0; - defstop = *step < 0 ? -1 : length; - if (r->start == Py_None) { - *start = defstart; + *start = *step < 0 ? PY_SSIZE_T_MAX-1 : 0;; } else { if (!_PyEval_SliceIndex(r->start, start)) return -1; - if (*start < 0) *start += length; - if (*start < 0) *start = (*step < 0) ? -1 : 0; - if (*start >= length) - *start = (*step < 0) ? length - 1 : length; } if (r->stop == Py_None) { - *stop = defstop; + *stop = *step < 0 ? -PY_SSIZE_T_MAX : PY_SSIZE_T_MAX; } else { if (!_PyEval_SliceIndex(r->stop, stop)) return -1; - if (*stop < 0) *stop += length; - if (*stop < 0) *stop = (*step < 0) ? -1 : 0; - if (*stop >= length) - *stop = (*step < 0) ? length - 1 : length; } - if ((*step < 0 && *stop >= *start) - || (*step > 0 && *start >= *stop)) { - *slicelength = 0; + return 0; +} + +Py_ssize_t +PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step) +{ + /* this is harder to get right than you might think */ + + assert(step != 0); + assert(step >= -PY_SSIZE_T_MAX); + + if (*start < 0) { + *start += length; + if (*start < 0) { + *start = (step < 0) ? -1 : 0; + } } - else if (*step < 0) { - *slicelength = (*stop-*start+1)/(*step)+1; + else if (*start >= length) { + *start = (step < 0) ? length - 1 : length; + } + + if (*stop < 0) { + *stop += length; + if (*stop < 0) { + *stop = (step < 0) ? -1 : 0; + } + } + else if (*stop >= length) { + *stop = (step < 0) ? length - 1 : length; + } + + if (step < 0) { + if (*stop < *start) { + return (*start - *stop - 1) / (-step) + 1; + } } else { - *slicelength = (*stop-*start-1)/(*step)+1; + if (*start < *stop) { + return (*stop - *start - 1) / step + 1; + } } + return 0; +} +#undef PySlice_GetIndicesEx + +int +PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) +{ + if (PySlice_Unpack(_r, start, stop, step) < 0) + return -1; + *slicelength = PySlice_AdjustIndices(length, start, stop, *step); return 0; } diff --git a/PC/python3.def b/PC/python3.def --- a/PC/python3.def +++ b/PC/python3.def @@ -531,10 +531,12 @@ PySet_Pop=python37.PySet_Pop PySet_Size=python37.PySet_Size PySet_Type=python37.PySet_Type DATA + PySlice_AdjustIndices=python37.PySlice_AdjustIndices PySlice_GetIndices=python37.PySlice_GetIndices PySlice_GetIndicesEx=python37.PySlice_GetIndicesEx PySlice_New=python37.PySlice_New PySlice_Type=python37.PySlice_Type DATA + PySlice_Unpack=python37.PySlice_Unpack PySortWrapper_Type=python37.PySortWrapper_Type DATA PyState_AddModule=python37.PyState_AddModule PyState_FindModule=python37.PyState_FindModule -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if
by serhiy.storchaka Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/b4457fe7fdb8 changeset: 106313:b4457fe7fdb8 branch: 3.6 parent: 106309:25fc68e22eee parent: 106312:96f5327f7253 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Jan 25 13:25:52 2017 +0200 summary: Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if Py_LIMITED_API is not set or set to the value between 0x03050400 and 0x03060000 (not including) or 0x03060100 or higher. files: Include/sliceobject.h | 16 +++++- Misc/NEWS | 4 + Objects/sliceobject.c | 78 +++++++++++++++++++++--------- PC/python3.def | 2 + 4 files changed, 74 insertions(+), 26 deletions(-) diff --git a/Include/sliceobject.h b/Include/sliceobject.h --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,8 +41,20 @@ PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t *step, Py_ssize_t *slicelength); + +#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 +#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ + PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? -1 : \ + ((*slicelen = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ + 0)) +PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); +PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t step); +#endif #ifdef __cplusplus } diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -143,6 +143,10 @@ C API ----- +- Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if + Py_LIMITED_API is not set or set to the value between 0x03050400 + and 0x03060000 (not including) or 0x03060100 or higher. + - Issue #29083: Fixed the declaration of some public API functions. PyArg_VaParse() and PyArg_VaParseTupleAndKeywords() were not available in limited API. PyArg_ValidateKeywordArguments(), PyArg_UnpackTuple() and diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -191,15 +191,12 @@ } int -PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, - Py_ssize_t *slicelength) +PySlice_Unpack(PyObject *_r, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) { PySliceObject *r = (PySliceObject*)_r; /* this is harder to get right than you might think */ - Py_ssize_t defstart, defstop; - if (r->step == Py_None) { *step = 1; } @@ -219,42 +216,75 @@ *step = -PY_SSIZE_T_MAX; } - defstart = *step < 0 ? length-1 : 0; - defstop = *step < 0 ? -1 : length; - if (r->start == Py_None) { - *start = defstart; + *start = *step < 0 ? PY_SSIZE_T_MAX-1 : 0;; } else { if (!_PyEval_SliceIndex(r->start, start)) return -1; - if (*start < 0) *start += length; - if (*start < 0) *start = (*step < 0) ? -1 : 0; - if (*start >= length) - *start = (*step < 0) ? length - 1 : length; } if (r->stop == Py_None) { - *stop = defstop; + *stop = *step < 0 ? -PY_SSIZE_T_MAX : PY_SSIZE_T_MAX; } else { if (!_PyEval_SliceIndex(r->stop, stop)) return -1; - if (*stop < 0) *stop += length; - if (*stop < 0) *stop = (*step < 0) ? -1 : 0; - if (*stop >= length) - *stop = (*step < 0) ? length - 1 : length; } - if ((*step < 0 && *stop >= *start) - || (*step > 0 && *start >= *stop)) { - *slicelength = 0; + return 0; +} + +Py_ssize_t +PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step) +{ + /* this is harder to get right than you might think */ + + assert(step != 0); + assert(step >= -PY_SSIZE_T_MAX); + + if (*start < 0) { + *start += length; + if (*start < 0) { + *start = (step < 0) ? -1 : 0; + } } - else if (*step < 0) { - *slicelength = (*stop-*start+1)/(*step)+1; + else if (*start >= length) { + *start = (step < 0) ? length - 1 : length; + } + + if (*stop < 0) { + *stop += length; + if (*stop < 0) { + *stop = (step < 0) ? -1 : 0; + } + } + else if (*stop >= length) { + *stop = (step < 0) ? length - 1 : length; + } + + if (step < 0) { + if (*stop < *start) { + return (*start - *stop - 1) / (-step) + 1; + } } else { - *slicelength = (*stop-*start-1)/(*step)+1; + if (*start < *stop) { + return (*stop - *start - 1) / step + 1; + } } + return 0; +} +#undef PySlice_GetIndicesEx + +int +PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) +{ + if (PySlice_Unpack(_r, start, stop, step) < 0) + return -1; + *slicelength = PySlice_AdjustIndices(length, start, stop, *step); return 0; } diff --git a/PC/python3.def b/PC/python3.def --- a/PC/python3.def +++ b/PC/python3.def @@ -531,10 +531,12 @@ PySet_Pop=python36.PySet_Pop PySet_Size=python36.PySet_Size PySet_Type=python36.PySet_Type DATA + PySlice_AdjustIndices=python36.PySlice_AdjustIndices PySlice_GetIndices=python36.PySlice_GetIndices PySlice_GetIndicesEx=python36.PySlice_GetIndicesEx PySlice_New=python36.PySlice_New PySlice_Type=python36.PySlice_Type DATA + PySlice_Unpack=python36.PySlice_Unpack PySortWrapper_Type=python36.PySortWrapper_Type DATA PyState_AddModule=python36.PyState_AddModule PyState_FindModule=python36.PyState_FindModule -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): Merge heads
by serhiy.storchaka Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/743ff7902879 changeset: 106315:743ff7902879 branch: 2.7 parent: 106311:d5590f357d74 parent: 106308:b43e270648a3 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Jan 25 13:28:45 2017 +0200 summary: Merge heads files: Doc/using/unix.rst | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -136,17 +136,12 @@ To use shell commands in your Python scripts, look at the :mod:`subprocess` module. -Editors -======= +Editors and IDEs +================ -Vim and Emacs are excellent editors which support Python very well. For more -information on how to code in Python in these editors, look at: +There are a number of IDEs that support Python programming language. +Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 checks. -* http://www.vim.org/scripts/script.php?script_id=790 -* https://sourceforge.net/projects/python-mode - -Geany is an excellent IDE with support for a lot of languages. For more -information, read: https://www.geany.org/ - -Komodo edit is another extremely good IDE. It also has support for a lot of -languages. For more information, read https://komodoide.com/. +Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and +`Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_ +for a comprehensive list. \ No newline at end of file -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if
by serhiy.storchaka Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/96f5327f7253 changeset: 106312:96f5327f7253 branch: 3.5 parent: 106302:5cdf383ef35c user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Jan 25 13:23:05 2017 +0200 summary: Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if Py_LIMITED_API is not set or set to the value between 0x03050400 and 0x03060000 (not including) or 0x03060100 or higher. files: Include/sliceobject.h | 16 +++++- Misc/NEWS | 4 + Objects/sliceobject.c | 78 +++++++++++++++++++++--------- PC/python3.def | 2 + 4 files changed, 74 insertions(+), 26 deletions(-) diff --git a/Include/sliceobject.h b/Include/sliceobject.h --- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,8 +41,20 @@ PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t *step, Py_ssize_t *slicelength); + +#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 +#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ + PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? -1 : \ + ((*slicelen = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ + 0)) +PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); +PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t step); +#endif #ifdef __cplusplus } diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,10 @@ C API ----- +- Issue #27867: Function PySlice_GetIndicesEx() is replaced with a macro if + Py_LIMITED_API is not set or set to the value between 0x03050400 + and 0x03060000 (not including) or 0x03060100 or higher. + - Issue #29083: Fixed the declaration of some public API functions. PyArg_VaParse() and PyArg_VaParseTupleAndKeywords() were not available in limited API. PyArg_ValidateKeywordArguments(), PyArg_UnpackTuple() and diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c --- a/Objects/sliceobject.c +++ b/Objects/sliceobject.c @@ -191,15 +191,12 @@ } int -PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, - Py_ssize_t *slicelength) +PySlice_Unpack(PyObject *_r, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step) { PySliceObject *r = (PySliceObject*)_r; /* this is harder to get right than you might think */ - Py_ssize_t defstart, defstop; - if (r->step == Py_None) { *step = 1; } @@ -219,42 +216,75 @@ *step = -PY_SSIZE_T_MAX; } - defstart = *step < 0 ? length-1 : 0; - defstop = *step < 0 ? -1 : length; - if (r->start == Py_None) { - *start = defstart; + *start = *step < 0 ? PY_SSIZE_T_MAX-1 : 0;; } else { if (!_PyEval_SliceIndex(r->start, start)) return -1; - if (*start < 0) *start += length; - if (*start < 0) *start = (*step < 0) ? -1 : 0; - if (*start >= length) - *start = (*step < 0) ? length - 1 : length; } if (r->stop == Py_None) { - *stop = defstop; + *stop = *step < 0 ? -PY_SSIZE_T_MAX : PY_SSIZE_T_MAX; } else { if (!_PyEval_SliceIndex(r->stop, stop)) return -1; - if (*stop < 0) *stop += length; - if (*stop < 0) *stop = (*step < 0) ? -1 : 0; - if (*stop >= length) - *stop = (*step < 0) ? length - 1 : length; } - if ((*step < 0 && *stop >= *start) - || (*step > 0 && *start >= *stop)) { - *slicelength = 0; + return 0; +} + +Py_ssize_t +PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step) +{ + /* this is harder to get right than you might think */ + + assert(step != 0); + assert(step >= -PY_SSIZE_T_MAX); + + if (*start < 0) { + *start += length; + if (*start < 0) { + *start = (step < 0) ? -1 : 0; + } } - else if (*step < 0) { - *slicelength = (*stop-*start+1)/(*step)+1; + else if (*start >= length) { + *start = (step < 0) ? length - 1 : length; + } + + if (*stop < 0) { + *stop += length; + if (*stop < 0) { + *stop = (step < 0) ? -1 : 0; + } + } + else if (*stop >= length) { + *stop = (step < 0) ? length - 1 : length; + } + + if (step < 0) { + if (*stop < *start) { + return (*start - *stop - 1) / (-step) + 1; + } } else { - *slicelength = (*stop-*start-1)/(*step)+1; + if (*start < *stop) { + return (*stop - *start - 1) / step + 1; + } } + return 0; +} +#undef PySlice_GetIndicesEx + +int +PySlice_GetIndicesEx(PyObject *_r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) +{ + if (PySlice_Unpack(_r, start, stop, step) < 0) + return -1; + *slicelength = PySlice_AdjustIndices(length, start, stop, *step); return 0; } diff --git a/PC/python3.def b/PC/python3.def --- a/PC/python3.def +++ b/PC/python3.def @@ -527,10 +527,12 @@ PySet_Pop=python35.PySet_Pop PySet_Size=python35.PySet_Size PySet_Type=python35.PySet_Type DATA + PySlice_AdjustIndices=python35.PySlice_AdjustIndices PySlice_GetIndices=python35.PySlice_GetIndices PySlice_GetIndicesEx=python35.PySlice_GetIndicesEx PySlice_New=python35.PySlice_New PySlice_Type=python35.PySlice_Type DATA + PySlice_Unpack=python35.PySlice_Unpack PySortWrapper_Type=python35.PySortWrapper_Type DATA PyState_AddModule=python35.PyState_AddModule PyState_FindModule=python35.PyState_FindModule -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): [merge 3.6] - issue26149 - Point to Wiki for Editors and Python IDEs on Unix.
by senthil.kumaran Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/0fd4a3d8e32a changeset: 106310:0fd4a3d8e32a parent: 106307:ffc0840762e4 parent: 106309:25fc68e22eee user: Senthil Kumaran <senthil(a)uthcode.com> date: Wed Jan 25 01:48:41 2017 -0800 summary: [merge 3.6] - issue26149 - Point to Wiki for Editors and Python IDEs on Unix. Patch contributed by Mariatta Wijaya. files: Doc/using/unix.rst | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -132,17 +132,12 @@ To use shell commands in your Python scripts, look at the :mod:`subprocess` module. -Editors -======= +Editors and IDEs +================ -Vim and Emacs are excellent editors which support Python very well. For more -information on how to code in Python in these editors, look at: +There are a number of IDEs that support Python programming language. +Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 checks. -* http://www.vim.org/scripts/script.php?script_id=790 -* https://sourceforge.net/projects/python-mode - -Geany is an excellent IDE with support for a lot of languages. For more -information, read: https://www.geany.org/ - -Komodo edit is another extremely good IDE. It also has support for a lot of -languages. For more information, read https://komodoide.com/. +Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and +`Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_ +for a comprehensive list. \ No newline at end of file -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): issue26149 - Point to Wiki for Editors and Python IDEs on Unix.
by senthil.kumaran Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/25fc68e22eee changeset: 106309:25fc68e22eee branch: 3.6 parent: 106305:95e184bd2d89 user: Senthil Kumaran <senthil(a)uthcode.com> date: Wed Jan 25 01:47:49 2017 -0800 summary: issue26149 - Point to Wiki for Editors and Python IDEs on Unix. Patch contributed by Mariatta Wijaya. files: Doc/using/unix.rst | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -132,17 +132,12 @@ To use shell commands in your Python scripts, look at the :mod:`subprocess` module. -Editors -======= +Editors and IDEs +================ -Vim and Emacs are excellent editors which support Python very well. For more -information on how to code in Python in these editors, look at: +There are a number of IDEs that support Python programming language. +Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 checks. -* http://www.vim.org/scripts/script.php?script_id=790 -* https://sourceforge.net/projects/python-mode - -Geany is an excellent IDE with support for a lot of languages. For more -information, read: https://www.geany.org/ - -Komodo edit is another extremely good IDE. It also has support for a lot of -languages. For more information, read https://komodoide.com/. +Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and +`Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_ +for a comprehensive list. \ No newline at end of file -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): issue26149 - Point to Wiki for Editors and Python IDEs on Unix.
by senthil.kumaran Jan. 25, 2017

Jan. 25, 2017

https://hg.python.org/cpython/rev/b43e270648a3 changeset: 106308:b43e270648a3 branch: 2.7 parent: 106292:fb2885f9b4dd user: Senthil Kumaran <senthil(a)uthcode.com> date: Wed Jan 25 01:46:33 2017 -0800 summary: issue26149 - Point to Wiki for Editors and Python IDEs on Unix. Patch contributed by Mariatta Wijaya. files: Doc/using/unix.rst | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -136,17 +136,12 @@ To use shell commands in your Python scripts, look at the :mod:`subprocess` module. -Editors -======= +Editors and IDEs +================ -Vim and Emacs are excellent editors which support Python very well. For more -information on how to code in Python in these editors, look at: +There are a number of IDEs that support Python programming language. +Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 checks. -* http://www.vim.org/scripts/script.php?script_id=790 -* https://sourceforge.net/projects/python-mode - -Geany is an excellent IDE with support for a lot of languages. For more -information, read: https://www.geany.org/ - -Komodo edit is another extremely good IDE. It also has support for a lot of -languages. For more information, read https://komodoide.com/. +Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and +`Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_ +for a comprehensive list. \ No newline at end of file -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (ffc0840762e4): sum=4
by solipsis＠pitrou.net Jan. 25, 2017

Jan. 25, 2017

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

1 0

cpython: Issues #29311, #29289: Fixed and improved docstrings for dict and OrderedDict
by serhiy.storchaka Jan. 24, 2017

Jan. 24, 2017

https://hg.python.org/cpython/rev/ffc0840762e4 changeset: 106307:ffc0840762e4 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Wed Jan 25 00:30:04 2017 +0200 summary: Issues #29311, #29289: Fixed and improved docstrings for dict and OrderedDict methods. files: Lib/collections/__init__.py | 19 ++++++++--------- Objects/clinic/dictobject.c.h | 12 ++++++---- Objects/clinic/odictobject.c.h | 17 +++++++-------- Objects/dictobject.c | 18 +++++++++------- Objects/odictobject.c | 23 ++++++++++----------- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -157,9 +157,9 @@ dict.clear(self) def popitem(self, last=True): - '''od.popitem() -> (k, v), return and remove a (key, value) pair. + '''Remove and return a (key, value) pair from the dictionary. + Pairs are returned in LIFO order if last is true or FIFO order if false. - ''' if not self: raise KeyError('dictionary is empty') @@ -180,11 +180,9 @@ return key, value def move_to_end(self, key, last=True): - '''Move an existing element to the end (or beginning if last==False). + '''Move an existing element to the end (or beginning if last is false). - Raises KeyError if the element does not exist. - When last=True, acts like a fast version of self[key]=self.pop(key). - + Raise KeyError if the element does not exist. ''' link = self.__map[key] link_prev = link.prev @@ -248,7 +246,10 @@ return default def setdefault(self, key, default=None): - 'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od' + '''Insert key with a value of default if key is not in the dictionary. + + Return the value for key if key is in the dictionary, else default. + ''' if key in self: return self[key] self[key] = default @@ -274,9 +275,7 @@ @classmethod def fromkeys(cls, iterable, value=None): - '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S. - If not specified, the value defaults to None. - + '''Create a new ordered dictionary with keys from iterable and values set to value. ''' self = cls() for key in iterable: diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h --- a/Objects/clinic/dictobject.c.h +++ b/Objects/clinic/dictobject.c.h @@ -6,7 +6,7 @@ "fromkeys($type, iterable, value=None, /)\n" "--\n" "\n" -"Returns a new dict with keys from iterable and values equal to value."); +"Create a new dictionary with keys from iterable and values set to value."); #define DICT_FROMKEYS_METHODDEF \ {"fromkeys", (PyCFunction)dict_fromkeys, METH_FASTCALL|METH_CLASS, dict_fromkeys__doc__}, @@ -40,7 +40,7 @@ "__contains__($self, key, /)\n" "--\n" "\n" -"True if D has a key k, else False."); +"True if the dictionary has a specified key, else False."); #define DICT___CONTAINS___METHODDEF \ {"__contains__", (PyCFunction)dict___contains__, METH_O|METH_COEXIST, dict___contains____doc__}, @@ -49,7 +49,7 @@ "get($self, key, default=None, /)\n" "--\n" "\n" -"D.get(key[, default]) -> D[key] if key in D, else default."); +"Return the value for key if key is in the dictionary, else default."); #define DICT_GET_METHODDEF \ {"get", (PyCFunction)dict_get, METH_FASTCALL, dict_get__doc__}, @@ -83,7 +83,9 @@ "setdefault($self, key, default=None, /)\n" "--\n" "\n" -"D.get(key,default), also set D[key]=default if key not in D."); +"Insert key with a value of default if key is not in the dictionary.\n" +"\n" +"Return the value for key if key is in the dictionary, else default."); #define DICT_SETDEFAULT_METHODDEF \ {"setdefault", (PyCFunction)dict_setdefault, METH_FASTCALL, dict_setdefault__doc__}, @@ -113,4 +115,4 @@ exit: return return_value; } -/*[clinic end generated code: output=6e9d917602373072 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=91aa6a9f3c402b1b input=a9049054013a1b77]*/ diff --git a/Objects/clinic/odictobject.c.h b/Objects/clinic/odictobject.c.h --- a/Objects/clinic/odictobject.c.h +++ b/Objects/clinic/odictobject.c.h @@ -6,9 +6,7 @@ "fromkeys($type, /, iterable, value=None)\n" "--\n" "\n" -"New ordered dictionary with keys from S.\n" -"\n" -"If not specified, the value defaults to None."); +"Create a new ordered dictionary with keys from iterable and values set to value."); #define ORDEREDDICT_FROMKEYS_METHODDEF \ {"fromkeys", (PyCFunction)OrderedDict_fromkeys, METH_FASTCALL|METH_CLASS, OrderedDict_fromkeys__doc__}, @@ -39,7 +37,9 @@ "setdefault($self, /, key, default=None)\n" "--\n" "\n" -"od.get(k,d), also set od[k]=d if k not in od."); +"Insert key with a value of default if key is not in the dictionary.\n" +"\n" +"Return the value for key if key is in the dictionary, else default."); #define ORDEREDDICT_SETDEFAULT_METHODDEF \ {"setdefault", (PyCFunction)OrderedDict_setdefault, METH_FASTCALL, OrderedDict_setdefault__doc__}, @@ -71,7 +71,7 @@ "popitem($self, /, last=True)\n" "--\n" "\n" -"Return (k, v) and remove a (key, value) pair.\n" +"Remove and return a (key, value) pair from the dictionary.\n" "\n" "Pairs are returned in LIFO order if last is true or FIFO order if false."); @@ -103,10 +103,9 @@ "move_to_end($self, /, key, last=True)\n" "--\n" "\n" -"\"Move an existing element to the end (or beginning if last==False).\n" +"Move an existing element to the end (or beginning if last is false).\n" "\n" -" Raises KeyError if the element does not exist.\n" -" When last=True, acts like a fast version of self[key]=self.pop(key)."); +"Raise KeyError if the element does not exist."); #define ORDEREDDICT_MOVE_TO_END_METHODDEF \ {"move_to_end", (PyCFunction)OrderedDict_move_to_end, METH_FASTCALL, OrderedDict_move_to_end__doc__}, @@ -132,4 +131,4 @@ exit: return return_value; } -/*[clinic end generated code: output=84ef19e7b5db0086 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a19a24ac37b42e5e input=a9049054013a1b77]*/ diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2311,12 +2311,12 @@ value: object=None / -Returns a new dict with keys from iterable and values equal to value. +Create a new dictionary with keys from iterable and values set to value. [clinic start generated code]*/ static PyObject * dict_fromkeys_impl(PyTypeObject *type, PyObject *iterable, PyObject *value) -/*[clinic end generated code: output=8fb98e4b10384999 input=b85a667f9bf4669d]*/ +/*[clinic end generated code: output=8fb98e4b10384999 input=382ba4855d0f74c3]*/ { return _PyDict_FromKeys((PyObject *)type, iterable, value); } @@ -2764,12 +2764,12 @@ key: object / -True if D has a key k, else False. +True if the dictionary has the specified key, else False. [clinic start generated code]*/ static PyObject * dict___contains__(PyDictObject *self, PyObject *key) -/*[clinic end generated code: output=a3d03db709ed6e6b input=b852b2a19b51ab24]*/ +/*[clinic end generated code: output=a3d03db709ed6e6b input=f39613886bf975b7]*/ { register PyDictObject *mp = self; Py_hash_t hash; @@ -2797,12 +2797,12 @@ default: object = None / -D.get(key[, default]) -> D[key] if key in D, else default. +Return the value for key if key is in the dictionary, else default. [clinic start generated code]*/ static PyObject * dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value) -/*[clinic end generated code: output=bba707729dee05bf input=e73ab0f028f4b2be]*/ +/*[clinic end generated code: output=bba707729dee05bf input=279ddb5790b6b107]*/ { PyObject *val = NULL; Py_hash_t hash; @@ -2915,13 +2915,15 @@ default: object = None / -D.get(key,default), also set D[key]=default if key not in D. +Insert key with a value of default if key is not in the dictionary. + +Return the value for key if key is in the dictionary, else default. [clinic start generated code]*/ static PyObject * dict_setdefault_impl(PyDictObject *self, PyObject *key, PyObject *default_value) -/*[clinic end generated code: output=f8c1101ebf69e220 input=b2826255bacd845a]*/ +/*[clinic end generated code: output=f8c1101ebf69e220 input=0f063756e815fd9d]*/ { PyObject *val; diff --git a/Objects/odictobject.c b/Objects/odictobject.c --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -926,14 +926,12 @@ iterable as seq: object value: object = None -New ordered dictionary with keys from S. - -If not specified, the value defaults to None. +Create a new ordered dictionary with keys from iterable and values set to value. [clinic start generated code]*/ static PyObject * OrderedDict_fromkeys_impl(PyTypeObject *type, PyObject *seq, PyObject *value) -/*[clinic end generated code: output=c10390d452d78d6d input=33eefc496d5eee7b]*/ +/*[clinic end generated code: output=c10390d452d78d6d input=1a0476c229c597b3]*/ { return _PyDict_FromKeys((PyObject *)type, seq, value); } @@ -1014,13 +1012,15 @@ key: object default: object = None -od.get(k,d), also set od[k]=d if k not in od. +Insert key with a value of default if key is not in the dictionary. + +Return the value for key if key is in the dictionary, else default. [clinic start generated code]*/ static PyObject * OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key, PyObject *default_value) -/*[clinic end generated code: output=97537cb7c28464b6 input=d5e940fcea7a5a67]*/ +/*[clinic end generated code: output=97537cb7c28464b6 input=38e098381c1efbc6]*/ { PyObject *result = NULL; @@ -1165,14 +1165,14 @@ last: bool = True -Return (k, v) and remove a (key, value) pair. +Remove and return a (key, value) pair from the dictionary. Pairs are returned in LIFO order if last is true or FIFO order if false. [clinic start generated code]*/ static PyObject * OrderedDict_popitem_impl(PyODictObject *self, int last) -/*[clinic end generated code: output=98e7d986690d49eb input=4937da2015939126]*/ +/*[clinic end generated code: output=98e7d986690d49eb input=d992ac5ee8305e1a]*/ { PyObject *key, *value, *item = NULL; _ODictNode *node; @@ -1324,15 +1324,14 @@ key: object last: bool = True -"Move an existing element to the end (or beginning if last==False). +Move an existing element to the end (or beginning if last is false). - Raises KeyError if the element does not exist. - When last=True, acts like a fast version of self[key]=self.pop(key). +Raise KeyError if the element does not exist. [clinic start generated code]*/ static PyObject * OrderedDict_move_to_end_impl(PyODictObject *self, PyObject *key, int last) -/*[clinic end generated code: output=fafa4c5cc9b92f20 input=3b8283f7d0e15e43]*/ +/*[clinic end generated code: output=fafa4c5cc9b92f20 input=d6ceff7132a2fcd7]*/ { _ODictNode *node; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): closes issue29167: fix race condition in (Int)Flag
by ethan.furman Jan. 24, 2017

Jan. 24, 2017

https://hg.python.org/cpython/rev/95e184bd2d89 changeset: 106305:95e184bd2d89 branch: 3.6 parent: 106303:8eae65136000 user: Ethan Furman <ethan(a)stoneleaf.us> date: Tue Jan 24 12:12:06 2017 -0800 summary: closes issue29167: fix race condition in (Int)Flag files: Lib/enum.py | 15 +++- Lib/test/test_enum.py | 90 ++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 6 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py --- a/Lib/enum.py +++ b/Lib/enum.py @@ -690,7 +690,9 @@ pseudo_member = object.__new__(cls) pseudo_member._name_ = None pseudo_member._value_ = value - cls._value2member_map_[value] = pseudo_member + # use setdefault in case another thread already created a composite + # with this value + pseudo_member = cls._value2member_map_.setdefault(value, pseudo_member) return pseudo_member def __contains__(self, other): @@ -785,7 +787,9 @@ pseudo_member = int.__new__(cls, value) pseudo_member._name_ = None pseudo_member._value_ = value - cls._value2member_map_[value] = pseudo_member + # use setdefault in case another thread already created a composite + # with this value + pseudo_member = cls._value2member_map_.setdefault(value, pseudo_member) return pseudo_member def __or__(self, other): @@ -835,18 +839,21 @@ # _decompose is only called if the value is not named not_covered = value negative = value < 0 + # issue29167: wrap accesses to _value2member_map_ in a list to avoid race + # conditions between iterating over it and having more psuedo- + # members added to it if negative: # only check for named flags flags_to_check = [ (m, v) - for v, m in flag._value2member_map_.items() + for v, m in list(flag._value2member_map_.items()) if m.name is not None ] else: # check for named flags and powers-of-two flags flags_to_check = [ (m, v) - for v, m in flag._value2member_map_.items() + for v, m in list(flag._value2member_map_.items()) if m.name is not None or _power_of_two(v) ] members = [] diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -7,6 +7,11 @@ from io import StringIO from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL from test import support +try: + import threading +except ImportError: + threading = None + # for pickle tests try: @@ -1983,6 +1988,45 @@ d = 6 self.assertEqual(repr(Bizarre(7)), '<Bizarre.d|c|b: 7>') + @unittest.skipUnless(threading, 'Threading required for this test.') + @support.reap_threads + def test_unique_composite(self): + # override __eq__ to be identity only + class TestFlag(Flag): + one = auto() + two = auto() + three = auto() + four = auto() + five = auto() + six = auto() + seven = auto() + eight = auto() + def __eq__(self, other): + return self is other + def __hash__(self): + return hash(self._value_) + # have multiple threads competing to complete the composite members + seen = set() + failed = False + def cycle_enum(): + nonlocal failed + try: + for i in range(256): + seen.add(TestFlag(i)) + except Exception: + failed = True + threads = [ + threading.Thread(target=cycle_enum) + for _ in range(8) + ] + with support.start_threads(threads): + pass + # check that only 248 members were created + self.assertFalse( + failed, + 'at least one thread failed while creating composite members') + self.assertEqual(256, len(seen), 'too many composite members created') + class TestIntFlag(unittest.TestCase): """Tests of the IntFlags.""" @@ -2275,6 +2319,46 @@ for f in Open: self.assertEqual(bool(f.value), bool(f)) + @unittest.skipUnless(threading, 'Threading required for this test.') + @support.reap_threads + def test_unique_composite(self): + # override __eq__ to be identity only + class TestFlag(IntFlag): + one = auto() + two = auto() + three = auto() + four = auto() + five = auto() + six = auto() + seven = auto() + eight = auto() + def __eq__(self, other): + return self is other + def __hash__(self): + return hash(self._value_) + # have multiple threads competing to complete the composite members + seen = set() + failed = False + def cycle_enum(): + nonlocal failed + try: + for i in range(256): + seen.add(TestFlag(i)) + except Exception: + failed = True + threads = [ + threading.Thread(target=cycle_enum) + for _ in range(8) + ] + with support.start_threads(threads): + pass + # check that only 248 members were created + self.assertFalse( + failed, + 'at least one thread failed while creating composite members') + self.assertEqual(256, len(seen), 'too many composite members created') + + class TestUnique(unittest.TestCase): def test_unique_clean(self): @@ -2484,7 +2568,8 @@ class TestIntEnumConvert(unittest.TestCase): def test_convert_value_lookup_priority(self): test_type = enum.IntEnum._convert( - 'UnittestConvert', 'test.test_enum', + 'UnittestConvert', + ('test.test_enum', '__main__')[__name__=='__main__'], filter=lambda x: x.startswith('CONVERT_TEST_')) # We don't want the reverse lookup value to vary when there are # multiple possible names for a given value. It should always @@ -2493,7 +2578,8 @@ def test_convert(self): test_type = enum.IntEnum._convert( - 'UnittestConvert', 'test.test_enum', + 'UnittestConvert', + ('test.test_enum', '__main__')[__name__=='__main__'], filter=lambda x: x.startswith('CONVERT_TEST_')) # Ensure that test_type has all of the desired names and values. self.assertEqual(test_type.CONVERT_TEST_NAME_F, -- Repository URL: https://hg.python.org/cpython

1 0