Mailman 3 December 2015 - Python-checkins

cpython (merge 3.5 -> default): Issue #25447: Copying the lru_cache() wrapper object now always works,
by serhiy.storchaka 29 Dec '15

29 Dec '15

https://hg.python.org/cpython/rev/a0f9a8bee85f changeset: 99698:a0f9a8bee85f parent: 99695:71f071f2e074 parent: 99697:33b428ef34b9 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Dec 28 23:59:09 2015 +0200 summary: Issue #25447: Copying the lru_cache() wrapper object now always works, independedly from the type of the wrapped object (by returning the original object unchanged). files: Lib/test/test_functools.py | 14 ++++++++++++-- Misc/NEWS | 4 ++++ Modules/_functoolsmodule.c | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1262,14 +1262,24 @@ def test_copy(self): cls = self.__class__ - for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + def orig(x, y): + return 3 * x + y + part = self.module.partial(orig, 2) + funcs = (cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth, + self.module.lru_cache(2)(part)) + for f in funcs: with self.subTest(func=f): f_copy = copy.copy(f) self.assertIs(f_copy, f) def test_deepcopy(self): cls = self.__class__ - for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + def orig(x, y): + return 3 * x + y + part = self.module.partial(orig, 2) + funcs = (cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth, + self.module.lru_cache(2)(part)) + for f in funcs: with self.subTest(func=f): f_copy = copy.deepcopy(f) self.assertIs(f_copy, f) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -123,6 +123,10 @@ Library ------- +- Issue #25447: Copying the lru_cache() wrapper object now always works, + independedly from the type of the wrapped object (by returning the original + object unchanged). + - Issue #25768: Have the functions in compileall return booleans instead of ints and add proper documentation and tests for the return values. diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -1053,6 +1053,20 @@ return PyObject_GetAttrString(self, "__qualname__"); } +static PyObject * +lru_cache_copy(PyObject *self, PyObject *unused) +{ + Py_INCREF(self); + return self; +} + +static PyObject * +lru_cache_deepcopy(PyObject *self, PyObject *unused) +{ + Py_INCREF(self); + return self; +} + static int lru_cache_tp_traverse(lru_cache_object *self, visitproc visit, void *arg) { @@ -1104,6 +1118,8 @@ {"cache_info", (PyCFunction)lru_cache_cache_info, METH_NOARGS}, {"cache_clear", (PyCFunction)lru_cache_cache_clear, METH_NOARGS}, {"__reduce__", (PyCFunction)lru_cache_reduce, METH_NOARGS}, + {"__copy__", (PyCFunction)lru_cache_copy, METH_VARARGS}, + {"__deepcopy__", (PyCFunction)lru_cache_deepcopy, METH_VARARGS}, {NULL} }; -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Remove duplicate method in test_pathlib. Initial patch by Navneet Suman.
by ezio.melotti 29 Dec '15

29 Dec '15

https://hg.python.org/cpython/rev/1472c08d9c23 changeset: 99696:1472c08d9c23 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Dec 28 23:50:19 2015 +0200 summary: Remove duplicate method in test_pathlib. Initial patch by Navneet Suman. files: Lib/test/test_pathlib.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1437,13 +1437,13 @@ self.assertEqual(set(p.glob("dirA/../file*")), { P(BASE, "dirA/../fileA") }) self.assertEqual(set(p.glob("../xyzzy")), set()) - def _check_resolve_relative(self, p, expected): + + def _check_resolve(self, p, expected): q = p.resolve() self.assertEqual(q, expected) - def _check_resolve_absolute(self, p, expected): - q = p.resolve() - self.assertEqual(q, expected) + # this can be used to check both relative and absolute resolutions + _check_resolve_relative = _check_resolve_absolute = _check_resolve @with_symlinks def test_resolve_common(self): -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (71f071f2e074): sum=4
by solipsis＠pitrou.net 28 Dec '15

28 Dec '15

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

1 0

cpython: Issue #25768: Make compileall functions return booleans and document
by brett.cannon 28 Dec '15

28 Dec '15

https://hg.python.org/cpython/rev/71f071f2e074 changeset: 99695:71f071f2e074 user: Brett Cannon <brett(a)python.org> date: Sun Dec 27 13:17:04 2015 -0800 summary: Issue #25768: Make compileall functions return booleans and document the return values as well as test them. Thanks to Nicholas Chammas for the bug report and initial patch. files: Doc/library/compileall.rst | 12 +++++++--- Doc/whatsnew/3.6.rst | 5 ++++ Lib/compileall.py | 16 +++++++------- Lib/test/test_compileall.py | 26 +++++++++++++++++++++++- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 6 files changed, 49 insertions(+), 14 deletions(-) diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -103,7 +103,8 @@ .. function:: compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1, workers=1) Recursively descend the directory tree named by *dir*, compiling all :file:`.py` - files along the way. + files along the way. Return a true value if all the files compiled successfully, + and a false value otherwise. The *maxlevels* parameter is used to limit the depth of the recursion; it defaults to ``10``. @@ -155,7 +156,8 @@ .. function:: compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1) - Compile the file with path *fullname*. + Compile the file with path *fullname*. Return a true value if the file + compiled successfully, and a false value otherwise. If *ddir* is given, it is prepended to the path to the file being compiled for use in compilation time tracebacks, and is also compiled in to the @@ -191,8 +193,10 @@ .. function:: compile_path(skip_curdir=True, maxlevels=0, force=False, quiet=0, legacy=False, optimize=-1) - Byte-compile all the :file:`.py` files found along ``sys.path``. If - *skip_curdir* is true (the default), the current directory is not included + Byte-compile all the :file:`.py` files found along ``sys.path``. Return a + true value if all the files compiled successfully, and a false value otherwise. + + If *skip_curdir* is true (the default), the current directory is not included in the search. All other parameters are passed to the :func:`compile_dir` function. Note that unlike the other compile functions, ``maxlevels`` defaults to ``0``. diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -230,6 +230,11 @@ Changes in the Python API ------------------------- +* The functions in the :mod:`compileall` module now return booleans instead + of ``1`` or ``0`` to represent success or failure, respectively. Thanks to + booleans being a subclass of integers, this should only be an issue if you + were doing identity checks for ``1`` or ``0``. See :issue:`25768`. + * Reading the :attr:`~urllib.parse.SplitResult.port` attribute of :func:`urllib.parse.urlsplit` and :func:`~urllib.parse.urlparse` results now raises :exc:`ValueError` for out-of-range values, rather than diff --git a/Lib/compileall.py b/Lib/compileall.py --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -68,7 +68,7 @@ """ files = _walk_dir(dir, quiet=quiet, maxlevels=maxlevels, ddir=ddir) - success = 1 + success = True if workers is not None and workers != 1 and ProcessPoolExecutor is not None: if workers < 0: raise ValueError('workers must be greater or equal to 0') @@ -81,12 +81,12 @@ legacy=legacy, optimize=optimize), files) - success = min(results, default=1) + success = min(results, default=True) else: for file in files: if not compile_file(file, ddir, force, rx, quiet, legacy, optimize): - success = 0 + success = False return success def compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, @@ -104,7 +104,7 @@ legacy: if True, produce legacy pyc paths instead of PEP 3147 paths optimize: optimization level or -1 for level of the interpreter """ - success = 1 + success = True name = os.path.basename(fullname) if ddir is not None: dfile = os.path.join(ddir, name) @@ -144,7 +144,7 @@ ok = py_compile.compile(fullname, cfile, dfile, True, optimize=optimize) except py_compile.PyCompileError as err: - success = 0 + success = False if quiet >= 2: return success elif quiet: @@ -157,7 +157,7 @@ msg = msg.decode(sys.stdout.encoding) print(msg) except (SyntaxError, UnicodeError, OSError) as e: - success = 0 + success = False if quiet >= 2: return success elif quiet: @@ -167,7 +167,7 @@ print(e.__class__.__name__ + ':', e) else: if ok == 0: - success = 0 + success = False return success def compile_path(skip_curdir=1, maxlevels=0, force=False, quiet=0, @@ -183,7 +183,7 @@ legacy: as for compile_dir() (default False) optimize: as for compile_dir() (default -1) """ - success = 1 + success = True for dir in sys.path: if (not dir or dir == os.curdir) and skip_curdir: if quiet < 2: diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -1,6 +1,7 @@ import sys import compileall import importlib.util +import test.test_importlib.util import os import pathlib import py_compile @@ -40,6 +41,11 @@ def tearDown(self): shutil.rmtree(self.directory) + def add_bad_source_file(self): + self.bad_source_path = os.path.join(self.directory, '_test_bad.py') + with open(self.bad_source_path, 'w') as file: + file.write('x (\n') + def data(self): with open(self.bc_path, 'rb') as file: data = file.read(8) @@ -78,15 +84,31 @@ os.unlink(fn) except: pass - compileall.compile_file(self.source_path, force=False, quiet=True) + self.assertTrue(compileall.compile_file(self.source_path, + force=False, quiet=True)) self.assertTrue(os.path.isfile(self.bc_path) and not os.path.isfile(self.bc_path2)) os.unlink(self.bc_path) - compileall.compile_dir(self.directory, force=False, quiet=True) + self.assertTrue(compileall.compile_dir(self.directory, force=False, + quiet=True)) self.assertTrue(os.path.isfile(self.bc_path) and os.path.isfile(self.bc_path2)) os.unlink(self.bc_path) os.unlink(self.bc_path2) + # Test against bad files + self.add_bad_source_file() + self.assertFalse(compileall.compile_file(self.bad_source_path, + force=False, quiet=2)) + self.assertFalse(compileall.compile_dir(self.directory, + force=False, quiet=2)) + + def test_compile_path(self): + self.assertTrue(compileall.compile_path(quiet=2)) + + with test.test_importlib.util.import_state(path=[self.directory]): + self.add_bad_source_file() + self.assertFalse(compileall.compile_path(skip_curdir=False, + force=True, quiet=2)) def test_no_pycache_in_non_package(self): # Bug 8563 reported that __pycache__ directories got created by diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -235,6 +235,7 @@ Michael Cetrulo Dave Chambers Pascal Chambon +Nicholas Chammas John Chandler Hye-Shik Chang Jeffrey Chang diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -123,6 +123,9 @@ Library ------- +- Issue #25768: Have the functions in compileall return booleans instead of + ints and add proper documentation and tests for the return values. + - Issue #24103: Fixed possible use after free in ElementTree.XMLPullParser. - Issue #25860: os.fwalk() no longer skips remaining directories when error -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge for issue #12484
by brett.cannon 28 Dec '15

28 Dec '15

https://hg.python.org/cpython/rev/f4aee46c79ca changeset: 99694:f4aee46c79ca parent: 99692:c6bd004671a7 parent: 99693:003f1f60a09c user: Brett Cannon <brett(a)python.org> date: Sun Dec 27 12:24:36 2015 -0800 summary: Merge for issue #12484 files: Doc/c-api/import.rst | 5 ----- Doc/faq/extending.rst | 14 -------------- Misc/ACKS | 1 + 3 files changed, 1 insertions(+), 19 deletions(-) diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst --- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -236,11 +236,6 @@ For internal use only. -.. c:function:: PyObject* _PyImport_FixupExtension(char *, char *) - - For internal use only. - - .. c:function:: int PyImport_ImportFrozenModuleObject(PyObject *name) Load a frozen module named *name*. Return ``1`` for success, ``0`` if the diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -247,20 +247,6 @@ For Debian, run ``apt-get install python-dev``. -What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean? -------------------------------------------------------------------------------------- - -This means that you have created an extension module named "yourmodule", but -your module init function does not initialize with that name. - -Every module init function will have a line similar to:: - - module = Py_InitModule("yourmodule", yourmodule_functions); - -If the string passed to this function is not the same name as your extension -module, the :exc:`SystemError` exception will be raised. - - How do I tell "incomplete input" from "invalid input"? ------------------------------------------------------ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1313,6 +1313,7 @@ Denis Severson Ian Seyer Dmitry Shachnev +Anish Shah Daniel Shahaf Mark Shannon Ha Shao -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #12484: Remove a mention of Py_InitModule() and
by brett.cannon 28 Dec '15

28 Dec '15

https://hg.python.org/cpython/rev/003f1f60a09c changeset: 99693:003f1f60a09c branch: 3.5 parent: 99691:5114871a3ac6 user: Brett Cannon <brett(a)python.org> date: Sun Dec 27 12:24:06 2015 -0800 summary: Issue #12484: Remove a mention of Py_InitModule() and _PyImport_FixupExtension(). Thanks to Alejandro Santos for the bug report and Anish Shah for the patch. files: Doc/c-api/import.rst | 5 ----- Doc/faq/extending.rst | 14 -------------- Misc/ACKS | 1 + 3 files changed, 1 insertions(+), 19 deletions(-) diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst --- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -236,11 +236,6 @@ For internal use only. -.. c:function:: PyObject* _PyImport_FixupExtension(char *, char *) - - For internal use only. - - .. c:function:: int PyImport_ImportFrozenModuleObject(PyObject *name) Load a frozen module named *name*. Return ``1`` for success, ``0`` if the diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -247,20 +247,6 @@ For Debian, run ``apt-get install python-dev``. -What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean? -------------------------------------------------------------------------------------- - -This means that you have created an extension module named "yourmodule", but -your module init function does not initialize with that name. - -Every module init function will have a line similar to:: - - module = Py_InitModule("yourmodule", yourmodule_functions); - -If the string passed to this function is not the same name as your extension -module, the :exc:`SystemError` exception will be raised. - - How do I tell "incomplete input" from "invalid input"? ------------------------------------------------------ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1310,6 +1310,7 @@ Denis Severson Ian Seyer Dmitry Shachnev +Anish Shah Daniel Shahaf Mark Shannon Ha Shao -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge for issue #25874
by brett.cannon 28 Dec '15

28 Dec '15

https://hg.python.org/cpython/rev/c6bd004671a7 changeset: 99692:c6bd004671a7 parent: 99690:b02d256b8827 parent: 99691:5114871a3ac6 user: Brett Cannon <brett(a)python.org> date: Sun Dec 27 12:09:10 2015 -0800 summary: Merge for issue #25874 files: Doc/using/windows.rst | 8 ++++++++ Misc/ACKS | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -24,6 +24,14 @@ able to install for all users of a single machine, and a separate ZIP file is available for application-local distributions. +Supported Versions +------------------ + +As specified in :pep:`11`, a Python release only supports a Windows platform +while Microsoft considers the platform under extended support. This means that +Python 3.5 supports Windows Vista and newer. If you require Windows XP support +then please install Python 3.4. + Installation Steps ------------------ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1558,6 +1558,7 @@ Gerry Wiener Frank Wierzbicki Santoso Wijaya +Chris Wilcox Bryce "Zooko" Wilcox-O'Hearn Timothy Wild Jakub Wilk -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25874: Clarify platform support in the "Using Python on Windows" doc.
by brett.cannon 28 Dec '15

28 Dec '15

https://hg.python.org/cpython/rev/5114871a3ac6 changeset: 99691:5114871a3ac6 branch: 3.5 parent: 99687:4bfbb2714ae9 user: Brett Cannon <brett(a)python.org> date: Sun Dec 27 12:08:37 2015 -0800 summary: Issue #25874: Clarify platform support in the "Using Python on Windows" doc. Thanks to Chris Wilcox for the initial patch. files: Doc/using/windows.rst | 8 ++++++++ Misc/ACKS | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -24,6 +24,14 @@ able to install for all users of a single machine, and a separate ZIP file is available for application-local distributions. +Supported Versions +------------------ + +As specified in :pep:`11`, a Python release only supports a Windows platform +while Microsoft considers the platform under extended support. This means that +Python 3.5 supports Windows Vista and newer. If you require Windows XP support +then please install Python 3.4. + Installation Steps ------------------ diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1554,6 +1554,7 @@ Gerry Wiener Frank Wierzbicki Santoso Wijaya +Chris Wilcox Bryce "Zooko" Wilcox-O'Hearn Timothy Wild Jakub Wilk -- Repository URL: https://hg.python.org/cpython

1 0

peps: Change Talin's email address to viridia@gmail.com.
by guido.van.rossum 27 Dec '15

27 Dec '15

https://hg.python.org/peps/rev/ca2f801ef18f changeset: 6144:ca2f801ef18f user: Guido van Rossum <guido(a)python.org> date: Sun Dec 27 10:09:06 2015 -0700 summary: Change Talin's email address to viridia(a)gmail.com. files: pep-3101.txt | 2 +- pep-3102.txt | 2 +- pep-3115.txt | 2 +- pep-3119.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pep-3101.txt b/pep-3101.txt --- a/pep-3101.txt +++ b/pep-3101.txt @@ -2,7 +2,7 @@ Title: Advanced String Formatting Version: $Revision$ Last-Modified: $Date$ -Author: Talin <talin(a)acm.org> +Author: Talin <viridia(a)gmail.com> Status: Final Type: Standards Track Content-Type: text/plain diff --git a/pep-3102.txt b/pep-3102.txt --- a/pep-3102.txt +++ b/pep-3102.txt @@ -2,7 +2,7 @@ Title: Keyword-Only Arguments Version: $Revision$ Last-Modified: $Date$ -Author: Talin <talin(a)acm.org> +Author: Talin <viridia(a)gmail.com> Status: Final Type: Standards Track Content-Type: text/plain diff --git a/pep-3115.txt b/pep-3115.txt --- a/pep-3115.txt +++ b/pep-3115.txt @@ -2,7 +2,7 @@ Title: Metaclasses in Python 3000 Version: $Revision$ Last-Modified: $Date$ -Author: Talin <talin(a)acm.org> +Author: Talin <viridia(a)gmail.com> Status: Final Type: Standards Track Content-Type: text/plain diff --git a/pep-3119.txt b/pep-3119.txt --- a/pep-3119.txt +++ b/pep-3119.txt @@ -2,7 +2,7 @@ Title: Introducing Abstract Base Classes Version: $Revision$ Last-Modified: $Date$ -Author: Guido van Rossum <guido(a)python.org>, Talin <talin(a)acm.org> +Author: Guido van Rossum <guido(a)python.org>, Talin <viridia(a)gmail.com> Status: Final Type: Standards Track Content-Type: text/x-rst -- Repository URL: https://hg.python.org/peps

1 0

cpython: Issue #20440: Cleaning up the code by using Py_SETREF and Py_CLEAR.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/b02d256b8827 changeset: 99690:b02d256b8827 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 15:51:32 2015 +0200 summary: Issue #20440: Cleaning up the code by using Py_SETREF and Py_CLEAR. Old code is correct, but with Py_SETREF and Py_CLEAR it can be cleaner. This patch doesn't fix bugs and hence there is no need to backport it. files: Modules/_collectionsmodule.c | 5 +---- Modules/_ctypes/_ctypes.c | 10 ++++------ Modules/_elementtree.c | 6 +----- Modules/_io/bytesio.c | 6 ++---- Modules/itertoolsmodule.c | 22 ++++++---------------- Modules/pyexpat.c | 17 ++++------------- Objects/listobject.c | 10 ++-------- Objects/tupleobject.c | 5 +---- Objects/typeobject.c | 13 ++----------- 9 files changed, 23 insertions(+), 71 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1222,7 +1222,6 @@ static int deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v) { - PyObject *old_value; block *b; Py_ssize_t n, len=Py_SIZE(deque), halflen=(len+1)>>1, index=i; @@ -1249,9 +1248,7 @@ b = b->leftlink; } Py_INCREF(v); - old_value = b->data[i]; - b->data[i] = v; - Py_DECREF(old_value); + Py_SETREF(b->data[i], v); return 0; } diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -5123,23 +5123,22 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds) { PyObject *hresult, *text, *details; - PyBaseExceptionObject *bself; PyObject *a; int status; if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds)) - return -1; + return -1; if (!PyArg_ParseTuple(args, "OOO:COMError", &hresult, &text, &details)) return -1; a = PySequence_GetSlice(args, 1, PySequence_Size(args)); if (!a) - return -1; + return -1; status = PyObject_SetAttrString(self, "args", a); Py_DECREF(a); if (status < 0) - return -1; + return -1; if (PyObject_SetAttrString(self, "hresult", hresult) < 0) return -1; @@ -5150,9 +5149,8 @@ if (PyObject_SetAttrString(self, "details", details) < 0) return -1; - bself = (PyBaseExceptionObject *)self; Py_INCREF(args); - Py_SETREF(bself->args, args); + Py_SETREF((PyBaseExceptionObject *)self->args, args); return 0; } diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2338,13 +2338,9 @@ PyObject *element_factory) /*[clinic end generated code: output=91cfa7558970ee96 input=1b424eeefc35249c]*/ { - PyObject *tmp; - if (element_factory) { Py_INCREF(element_factory); - tmp = self->element_factory; - self->element_factory = element_factory; - Py_XDECREF(tmp); + Py_SETREF(self->element_factory, element_factory); } return 0; diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -87,7 +87,7 @@ static int unshare_buffer(bytesio *self, size_t size) { - PyObject *new_buf, *old_buf; + PyObject *new_buf; assert(SHARED_BUF(self)); assert(self->exports == 0); assert(size >= (size_t)self->string_size); @@ -96,9 +96,7 @@ return -1; memcpy(PyBytes_AS_STRING(new_buf), PyBytes_AS_STRING(self->buf), self->string_size); - old_buf = self->buf; - self->buf = new_buf; - Py_DECREF(old_buf); + Py_SETREF(self->buf, new_buf); return 0; } diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -77,7 +77,7 @@ static PyObject * groupby_next(groupbyobject *gbo) { - PyObject *newvalue, *newkey, *r, *grouper, *tmp; + PyObject *newvalue, *newkey, *r, *grouper; /* skip to next iteration group */ for (;;) { @@ -110,19 +110,12 @@ } } - tmp = gbo->currkey; - gbo->currkey = newkey; - Py_XDECREF(tmp); - - tmp = gbo->currvalue; - gbo->currvalue = newvalue; - Py_XDECREF(tmp); + Py_SETREF(gbo->currkey, newkey); + Py_SETREF(gbo->currvalue, newvalue); } Py_INCREF(gbo->currkey); - tmp = gbo->tgtkey; - gbo->tgtkey = gbo->currkey; - Py_XDECREF(tmp); + Py_SETREF(gbo->tgtkey, gbo->currkey); grouper = _grouper_create(gbo, gbo->tgtkey); if (grouper == NULL) @@ -3445,7 +3438,7 @@ static PyObject * accumulate_next(accumulateobject *lz) { - PyObject *val, *oldtotal, *newtotal; + PyObject *val, *newtotal; val = (*Py_TYPE(lz->it)->tp_iternext)(lz->it); if (val == NULL) @@ -3465,11 +3458,8 @@ if (newtotal == NULL) return NULL; - oldtotal = lz->total; - lz->total = newtotal; - Py_DECREF(oldtotal); - Py_INCREF(newtotal); + Py_SETREF(lz->total, newtotal); return newtotal; } diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1226,12 +1226,8 @@ self->itself = NULL; if (self->handlers != NULL) { - PyObject *temp; - for (i = 0; handler_info[i].name != NULL; i++) { - temp = self->handlers[i]; - self->handlers[i] = NULL; - Py_XDECREF(temp); - } + for (i = 0; handler_info[i].name != NULL; i++) + Py_CLEAR(self->handlers[i]); PyMem_Free(self->handlers); self->handlers = NULL; } @@ -1345,7 +1341,6 @@ int handlernum = handlername2int(name); if (handlernum >= 0) { xmlhandler c_handler = NULL; - PyObject *temp = self->handlers[handlernum]; if (v == Py_None) { /* If this is the character data handler, and a character @@ -1367,8 +1362,7 @@ Py_INCREF(v); c_handler = handler_info[handlernum].handler; } - self->handlers[handlernum] = v; - Py_XDECREF(temp); + Py_SETREF(self->handlers[handlernum], v); handler_info[handlernum].setter(self->itself, c_handler); return 1; } @@ -1898,15 +1892,12 @@ clear_handlers(xmlparseobject *self, int initial) { int i = 0; - PyObject *temp; for (; handler_info[i].name != NULL; i++) { if (initial) self->handlers[i] = NULL; else { - temp = self->handlers[i]; - self->handlers[i] = NULL; - Py_XDECREF(temp); + Py_CLEAR(self->handlers[i]); handler_info[i].setter(self->itself, NULL); } } diff --git a/Objects/listobject.c b/Objects/listobject.c --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -216,7 +216,6 @@ PyList_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem) { - PyObject *olditem; PyObject **p; if (!PyList_Check(op)) { Py_XDECREF(newitem); @@ -230,9 +229,7 @@ return -1; } p = ((PyListObject *)op) -> ob_item + i; - olditem = *p; - *p = newitem; - Py_XDECREF(olditem); + Py_SETREF(*p, newitem); return 0; } @@ -730,7 +727,6 @@ static int list_ass_item(PyListObject *a, Py_ssize_t i, PyObject *v) { - PyObject *old_value; if (i < 0 || i >= Py_SIZE(a)) { PyErr_SetString(PyExc_IndexError, "list assignment index out of range"); @@ -739,9 +735,7 @@ if (v == NULL) return list_ass_slice(a, i, i+1, v); Py_INCREF(v); - old_value = a->ob_item[i]; - a->ob_item[i] = v; - Py_DECREF(old_value); + Py_SETREF(a->ob_item[i], v); return 0; } diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -149,7 +149,6 @@ int PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem) { - PyObject *olditem; PyObject **p; if (!PyTuple_Check(op) || op->ob_refcnt != 1) { Py_XDECREF(newitem); @@ -163,9 +162,7 @@ return -1; } p = ((PyTupleObject *)op) -> ob_item + i; - olditem = *p; - *p = newitem; - Py_XDECREF(olditem); + Py_SETREF(*p, newitem); return 0; } diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -401,7 +401,6 @@ static int type_set_name(PyTypeObject *type, PyObject *value, void *context) { - PyHeapTypeObject* et; char *tp_name; PyObject *tmp; @@ -430,17 +429,9 @@ if (tp_name == NULL) return -1; - et = (PyHeapTypeObject*)type; - + type->tp_name = tp_name; Py_INCREF(value); - - /* Wait until et is a sane state before Py_DECREF'ing the old et->ht_name - value. (Bug #16447.) */ - tmp = et->ht_name; - et->ht_name = value; - - type->tp_name = tp_name; - Py_DECREF(tmp); + Py_SETREF(((PyHeapTypeObject*)type)->ht_name, value); return 0; } -- Repository URL: https://hg.python.org/cpython

1 0