Mailman 3 February 2019 - Python-checkins

bpo-35879: Fix type comment leaks (GH-11728)
by Guido van Rossum Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/d2b4c19d53f5f021fb1c7c32d48033a92a… commit: d2b4c19d53f5f021fb1c7c32d48033a92ac4fe49 branch: master author: Guido van Rossum <guido(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-02-01T15:28:13-08:00 summary: bpo-35879: Fix type comment leaks (GH-11728) * Fix leak for # type: ignore * Fix the type comment leak files: M Parser/parsetok.c M Python/ast.c diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 7fddc5a0e897..1fa4a1286b77 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -330,6 +330,7 @@ parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret, } if (type == TYPE_IGNORE) { + PyObject_FREE(str); if (!growable_int_array_add(&type_ignores, tok->lineno)) { err_ret->error = E_NOMEM; break; diff --git a/Python/ast.c b/Python/ast.c index c422e9651ced..45578a850f77 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -699,11 +699,16 @@ ast_error(struct compiling *c, const node *n, const char *errmsg, ...) */ static string -new_type_comment(const char *s) +new_type_comment(const char *s, struct compiling *c) { - return PyUnicode_DecodeUTF8(s, strlen(s), NULL); + PyObject *res = PyUnicode_DecodeUTF8(s, strlen(s), NULL); + if (PyArena_AddPyObject(c->c_arena, res) < 0) { + Py_DECREF(res); + return NULL; + } + return res; } -#define NEW_TYPE_COMMENT(n) new_type_comment(STR(n)) +#define NEW_TYPE_COMMENT(n) new_type_comment(STR(n), c) static int num_stmts(const node *n)

1 0

bpo-35877: Add test for while loop named expression without parentheses (GH-11726)
by Emily Morehouse Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/ac19081c26eaa7de3e6aabeb789ddc2e7c… commit: ac19081c26eaa7de3e6aabeb789ddc2e7cdd5b24 branch: master author: Emily Morehouse <emilyemorehouse(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-02-01T15:27:38-07:00 summary: bpo-35877: Add test for while loop named expression without parentheses (GH-11726) files: M Lib/test/test_named_expressions.py diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py index ff426f4cea29..e15111cf3839 100644 --- a/Lib/test/test_named_expressions.py +++ b/Lib/test/test_named_expressions.py @@ -195,7 +195,7 @@ def test_named_expression_assignment_14(self): Where all variables are positive integers, and a is at least as large as the n'th root of x, this algorithm returns the floor of the n'th root of x (and roughly doubling the number of accurate bits per - iteration):: + iteration): """ a = 9 n = 2 @@ -206,6 +206,12 @@ def test_named_expression_assignment_14(self): self.assertEqual(a, 1) + def test_named_expression_assignment_15(self): + while a := False: + pass # This will not run + + self.assertEqual(a, False) + class NamedExpressionScopeTest(unittest.TestCase):

1 0

bpo-35877: Make parenthesis optional for named expression in while statement (GH-11724)
by Emily Morehouse Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/d4fceaafb8e3f8700d9ec6ab37a51e9033… commit: d4fceaafb8e3f8700d9ec6ab37a51e903392f74f branch: master author: Xtreak <tir.karthi(a)gmail.com> committer: Emily Morehouse <emilyemorehouse(a)gmail.com> date: 2019-02-01T14:40:16-07:00 summary: bpo-35877: Make parenthesis optional for named expression in while statement (GH-11724) * Add parenthesis optional in named expressions for while statement * Add NEWS entry files: A Misc/NEWS.d/next/Core and Builtins/2019-02-01-22-38-11.bpo-35877.Jrse8f.rst M Grammar/Grammar M Lib/test/test_parser.py M Python/graminit.c diff --git a/Grammar/Grammar b/Grammar/Grammar index e65a688e4cd8..a42597805979 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -72,7 +72,7 @@ assert_stmt: 'assert' test [',' test] compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt async_stmt: 'async' (funcdef | with_stmt | for_stmt) if_stmt: 'if' namedexpr_test ':' suite ('elif' namedexpr_test ':' suite)* ['else' ':' suite] -while_stmt: 'while' test ':' suite ['else' ':' suite] +while_stmt: 'while' namedexpr_test ':' suite ['else' ':' suite] for_stmt: 'for' exprlist 'in' testlist ':' [TYPE_COMMENT] suite ['else' ':' suite] try_stmt: ('try' ':' suite ((except_clause ':' suite)+ diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py index 19f178203642..0afeb322e9b5 100644 --- a/Lib/test/test_parser.py +++ b/Lib/test/test_parser.py @@ -426,6 +426,7 @@ def test_named_expressions(self): self.check_suite("(a := 1)") self.check_suite("(a := a)") self.check_suite("if (match := pattern.search(data)) is None: pass") + self.check_suite("while match := pattern.search(f.read()): pass") self.check_suite("[y := f(x), y**2, y**3]") self.check_suite("filtered_data = [y for x in data if (y := f(x)) is None]") self.check_suite("(y := f(x))") diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-02-01-22-38-11.bpo-35877.Jrse8f.rst b/Misc/NEWS.d/next/Core and Builtins/2019-02-01-22-38-11.bpo-35877.Jrse8f.rst new file mode 100644 index 000000000000..1fb173fe463d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-02-01-22-38-11.bpo-35877.Jrse8f.rst @@ -0,0 +1,2 @@ +Make parenthesis optional for named expressions in while statement. Patch by +Karthikeyan Singaravelan. diff --git a/Python/graminit.c b/Python/graminit.c index 6e0f19891baa..5cdde2789c72 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -971,7 +971,7 @@ static arc arcs_42_0[1] = { {103, 1}, }; static arc arcs_42_1[1] = { - {26, 2}, + {99, 2}, }; static arc arcs_42_2[1] = { {27, 3},

1 0

bpo-35864: fix namedtuple._asdict() docstring (GH-11720)
by Raymond Hettinger Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/85d83ec7c99727476c79feb5c34c65264a… commit: 85d83ec7c99727476c79feb5c34c65264a99144e branch: master author: Amador Pahim <amador(a)pahim.org> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2019-02-01T12:38:57-08:00 summary: bpo-35864: fix namedtuple._asdict() docstring (GH-11720) files: M Lib/collections/__init__.py diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 835cc363d10a..aee79b931602 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -429,7 +429,7 @@ def __repr__(self): _dict, _zip = dict, zip def _asdict(self): - 'Return a new OrderedDict which maps field names to their values.' + 'Return a new dict which maps field names to their values.' return _dict(_zip(self._fields, self)) def __getnewargs__(self):

1 0

bpo-35861: Fix SyntaxWarning in test_named_expressions.py (GH-11722)
by Emily Morehouse Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/075de6cf6cb0f5f4d3711fc07f023a9a7a… commit: 075de6cf6cb0f5f4d3711fc07f023a9a7a0a816b branch: master author: Joannah Nanjekye <33177550+nanjekyejoannah(a)users.noreply.github.com> committer: Emily Morehouse <emilyemorehouse(a)gmail.com> date: 2019-02-01T12:58:43-07:00 summary: bpo-35861: Fix SyntaxWarning in test_named_expressions.py (GH-11722) files: M Lib/test/test_named_expressions.py diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py index e49fd7de20de..ff426f4cea29 100644 --- a/Lib/test/test_named_expressions.py +++ b/Lib/test/test_named_expressions.py @@ -165,7 +165,7 @@ def test_named_expression_assignment_09(self): else: self.fail("variable was not assigned using named expression") def test_named_expression_assignment_10(self): - if (match := 10) is 10: + if (match := 10) == 10: pass else: self.fail("variable was not assigned using named expression")

1 0

bpo-35766 follow-up: Kill half-support for FunctionType in PyAST_obj2mod (#11714)
by Guido van Rossum Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/3a32e3bf880f0842ac73d18285f5a1caa9… commit: 3a32e3bf880f0842ac73d18285f5a1caa902a2ca branch: master author: Guido van Rossum <guido(a)python.org> committer: GitHub <noreply(a)github.com> date: 2019-02-01T11:37:34-08:00 summary: bpo-35766 follow-up: Kill half-support for FunctionType in PyAST_obj2mod (#11714) See https://github.com/python/cpython/pull/11645/files/229874c612df868e7ae3e997… https://bugs.python.org/issue35766 files: M Parser/asdl_c.py M Python/Python-ast.c diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index a51a5db73904..1526995e3f8b 100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1187,19 +1187,18 @@ class PartingShots(StaticVisitor): } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -/* and 3 for "func_type" */ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) { mod_ty res; PyObject *req_type[3]; - char *req_name[] = {"Module", "Expression", "Interactive", "FunctionType"}; + char *req_name[] = {"Module", "Expression", "Interactive"}; int isinstance; req_type[0] = (PyObject*)Module_type; req_type[1] = (PyObject*)Expression_type; req_type[2] = (PyObject*)Interactive_type; - assert(0 <= mode && mode <= 3); + assert(0 <= mode && mode <= 2); if (!init_types()) return NULL; diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 1a56e90bca09..5467d192ee69 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -8917,19 +8917,18 @@ PyObject* PyAST_mod2obj(mod_ty t) } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -/* and 3 for "func_type" */ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) { mod_ty res; PyObject *req_type[3]; - char *req_name[] = {"Module", "Expression", "Interactive", "FunctionType"}; + char *req_name[] = {"Module", "Expression", "Interactive"}; int isinstance; req_type[0] = (PyObject*)Module_type; req_type[1] = (PyObject*)Expression_type; req_type[2] = (PyObject*)Interactive_type; - assert(0 <= mode && mode <= 3); + assert(0 <= mode && mode <= 2); if (!init_types()) return NULL;

1 0

bpo-35537: Fix function name in os.posix_spawnp() errors (GH-11719)
by Victor Stinner Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/325e4bac5ab49f47ec60242d3242647605… commit: 325e4bac5ab49f47ec60242d3242647605193a2e branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-02-01T15:47:24+01:00 summary: bpo-35537: Fix function name in os.posix_spawnp() errors (GH-11719) files: M Modules/posixmodule.c diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index e516b5bed33a..0f6bd1490434 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5166,11 +5166,11 @@ convert_sched_param(PyObject *param, struct sched_param *res); #endif static int -parse_posix_spawn_flags(PyObject *setpgroup, int resetids, int setsid, PyObject *setsigmask, +parse_posix_spawn_flags(const char *func_name, PyObject *setpgroup, + int resetids, int setsid, PyObject *setsigmask, PyObject *setsigdef, PyObject *scheduler, posix_spawnattr_t *attrp) { - const char *func_name = "posix_spawnp"; long all_flags = 0; errno = posix_spawnattr_init(attrp); @@ -5400,6 +5400,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a PyObject *setpgroup, int resetids, int setsid, PyObject *setsigmask, PyObject *setsigdef, PyObject *scheduler) { + const char *func_name = use_posix_spawnp ? "posix_spawnp" : "posix_spawn"; EXECV_CHAR **argvlist = NULL; EXECV_CHAR **envlist = NULL; posix_spawn_file_actions_t file_actions_buf; @@ -5417,19 +5418,20 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a like posix.environ. */ if (!PyList_Check(argv) && !PyTuple_Check(argv)) { - PyErr_SetString(PyExc_TypeError, - "posix_spawn: argv must be a tuple or list"); + PyErr_Format(PyExc_TypeError, + "%s: argv must be a tuple or list", func_name); goto exit; } argc = PySequence_Size(argv); if (argc < 1) { - PyErr_SetString(PyExc_ValueError, "posix_spawn: argv must not be empty"); + PyErr_Format(PyExc_ValueError, + "%s: argv must not be empty", func_name); return NULL; } if (!PyMapping_Check(env)) { - PyErr_SetString(PyExc_TypeError, - "posix_spawn: environment must be a mapping object"); + PyErr_Format(PyExc_TypeError, + "%s: environment must be a mapping object", func_name); goto exit; } @@ -5438,8 +5440,8 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a goto exit; } if (!argvlist[0][0]) { - PyErr_SetString(PyExc_ValueError, - "posix_spawn: argv first element cannot be empty"); + PyErr_Format(PyExc_ValueError, + "%s: argv first element cannot be empty", func_name); goto exit; } @@ -5467,8 +5469,8 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a file_actionsp = &file_actions_buf; } - if (parse_posix_spawn_flags(setpgroup, resetids, setsid, setsigmask, - setsigdef, scheduler, &attr)) { + if (parse_posix_spawn_flags(func_name, setpgroup, resetids, setsid, + setsigmask, setsigdef, scheduler, &attr)) { goto exit; } attrp = &attr;

1 0

bpo-35537: Skip test_start_new_session() of posix_spawn (GH-11718)
by Victor Stinner Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/1e39b83f24ffade3e0ca1a8004b461354f… commit: 1e39b83f24ffade3e0ca1a8004b461354f64ae08 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-02-01T11:40:26+01:00 summary: bpo-35537: Skip test_start_new_session() of posix_spawn (GH-11718) The test fails. Skip the test until a fix can be found. files: M Lib/test/test_posix.py diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index bc7a2d6fb3dc..e980dd014cd8 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1624,6 +1624,8 @@ def test_setsigmask_wrong_type(self): os.environ, setsigmask=[signal.NSIG, signal.NSIG+1]) + @unittest.skipIf(True, + "FIXME: bpo-35537: test fails is setsid is supported") def test_start_new_session(self): # For code coverage of calling setsid(). We don't care if we get an # EPERM error from it depending on the test execution environment, that

1 0

bpo-35537: Add setsid parameter to os.posix_spawn() and os.posix_spawnp() (GH-11608)
by Victor Stinner Feb. 1, 2019

Feb. 1, 2019

https://github.com/python/cpython/commit/80c5dfe74b4402d0a220c9227f262ec6fd… commit: 80c5dfe74b4402d0a220c9227f262ec6fde1d7fc branch: master author: Joannah Nanjekye <33177550+nanjekyejoannah(a)users.noreply.github.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2019-02-01T11:05:22+01:00 summary: bpo-35537: Add setsid parameter to os.posix_spawn() and os.posix_spawnp() (GH-11608) files: A Misc/NEWS.d/next/Library/2019-01-18-13-44-13.bpo-35537.R1lbTl.rst M Doc/library/os.rst M Lib/test/test_posix.py M Modules/clinic/posixmodule.c.h M Modules/posixmodule.c diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 2aa51f875d9e..aa1316b1f24a 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -3386,7 +3386,7 @@ written in Python, such as a mail server's external command delivery program. .. function:: posix_spawn(path, argv, env, *, file_actions=None, \ - setpgroup=None, resetids=False, setsigmask=(), \ + setpgroup=None, resetids=False, setsid=False, setsigmask=(), \ setsigdef=(), scheduler=None) Wraps the :c:func:`posix_spawn` C library API for use from Python. @@ -3444,6 +3444,11 @@ written in Python, such as a mail server's external command delivery program. setting of the effective UID and GID. This argument corresponds to the C library :c:data:`POSIX_SPAWN_RESETIDS` flag. + If the *setsid* argument is ``True``, it will create a new session ID + for `posix_spawn`. *setsid* requires :c:data:`POSIX_SPAWN_SETSID` + or :c:data:`POSIX_SPAWN_SETSID_NP` flag. Otherwise, :exc:`NotImplementedError` + is raised. + The *setsigmask* argument will set the signal mask to the signal set specified. If the parameter is not used, then the child inherits the parent's signal mask. This argument corresponds to the C library @@ -3462,9 +3467,10 @@ written in Python, such as a mail server's external command delivery program. .. versionadded:: 3.7 + .. availability:: Unix. .. function:: posix_spawnp(path, argv, env, *, file_actions=None, \ - setpgroup=None, resetids=False, setsigmask=(), \ + setpgroup=None, resetids=False, setsid=False, setsigmask=(), \ setsigdef=(), scheduler=None) Wraps the :c:func:`posix_spawnp` C library API for use from Python. @@ -3475,6 +3481,8 @@ written in Python, such as a mail server's external command delivery program. .. versionadded:: 3.8 + .. availability:: See :func:`posix_spawn` documentation. + .. function:: register_at_fork(*, before=None, after_in_parent=None, \ after_in_child=None) diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 165b83713408..bc7a2d6fb3dc 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1624,6 +1624,22 @@ def test_setsigmask_wrong_type(self): os.environ, setsigmask=[signal.NSIG, signal.NSIG+1]) + def test_start_new_session(self): + # For code coverage of calling setsid(). We don't care if we get an + # EPERM error from it depending on the test execution environment, that + # still indicates that it was called. + code = "import os; print(os.getpgid(os.getpid()))" + try: + self.spawn_func(sys.executable, + [sys.executable, "-c", code], + os.environ, setsid=True) + except NotImplementedError as exc: + self.skipTest("setsid is not supported: %s" % exc) + else: + parent_pgid = os.getpgid(os.getpid()) + child_pgid = int(output) + self.assertNotEqual(parent_pgid, child_pgid) + @unittest.skipUnless(hasattr(signal, 'pthread_sigmask'), 'need signal.pthread_sigmask()') def test_setsigdef(self): diff --git a/Misc/NEWS.d/next/Library/2019-01-18-13-44-13.bpo-35537.R1lbTl.rst b/Misc/NEWS.d/next/Library/2019-01-18-13-44-13.bpo-35537.R1lbTl.rst new file mode 100644 index 000000000000..56f23a179a4b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-18-13-44-13.bpo-35537.R1lbTl.rst @@ -0,0 +1 @@ +:func:`os.posix_spawn` and :func:`os.posix_spawnp` now have a *setsid* parameter. \ No newline at end of file diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h index ce17709c38ba..d47618ce25c0 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -1726,8 +1726,8 @@ os_execve(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *k PyDoc_STRVAR(os_posix_spawn__doc__, "posix_spawn($module, path, argv, env, /, *, file_actions=(),\n" -" setpgroup=None, resetids=False, setsigmask=(),\n" -" setsigdef=(), scheduler=None)\n" +" setpgroup=None, resetids=False, setsid=False,\n" +" setsigmask=(), setsigdef=(), scheduler=None)\n" "--\n" "\n" "Execute the program specified by path in a new process.\n" @@ -1743,7 +1743,9 @@ PyDoc_STRVAR(os_posix_spawn__doc__, " setpgroup\n" " The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n" " resetids\n" -" If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.\n" +" If the value is `true` the POSIX_SPAWN_RESETIDS will be activated.\n" +" setsid\n" +" If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n" " setsigmask\n" " The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n" " setsigdef\n" @@ -1757,30 +1759,32 @@ PyDoc_STRVAR(os_posix_spawn__doc__, static PyObject * os_posix_spawn_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env, PyObject *file_actions, - PyObject *setpgroup, int resetids, PyObject *setsigmask, - PyObject *setsigdef, PyObject *scheduler); + PyObject *setpgroup, int resetids, int setsid, + PyObject *setsigmask, PyObject *setsigdef, + PyObject *scheduler); static PyObject * os_posix_spawn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static const char * const _keywords[] = {"", "", "", "file_actions", "setpgroup", "resetids", "setsigmask", "setsigdef", "scheduler", NULL}; - static _PyArg_Parser _parser = {"O&OO|$OOiOOO:posix_spawn", _keywords, 0}; + static const char * const _keywords[] = {"", "", "", "file_actions", "setpgroup", "resetids", "setsid", "setsigmask", "setsigdef", "scheduler", NULL}; + static _PyArg_Parser _parser = {"O&OO|$OOiiOOO:posix_spawn", _keywords, 0}; path_t path = PATH_T_INITIALIZE("posix_spawn", "path", 0, 0); PyObject *argv; PyObject *env; PyObject *file_actions = NULL; PyObject *setpgroup = NULL; int resetids = 0; + int setsid = 0; PyObject *setsigmask = NULL; PyObject *setsigdef = NULL; PyObject *scheduler = NULL; if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser, - path_converter, &path, &argv, &env, &file_actions, &setpgroup, &resetids, &setsigmask, &setsigdef, &scheduler)) { + path_converter, &path, &argv, &env, &file_actions, &setpgroup, &resetids, &setsid, &setsigmask, &setsigdef, &scheduler)) { goto exit; } - return_value = os_posix_spawn_impl(module, &path, argv, env, file_actions, setpgroup, resetids, setsigmask, setsigdef, scheduler); + return_value = os_posix_spawn_impl(module, &path, argv, env, file_actions, setpgroup, resetids, setsid, setsigmask, setsigdef, scheduler); exit: /* Cleanup for path */ @@ -1795,8 +1799,8 @@ os_posix_spawn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje PyDoc_STRVAR(os_posix_spawnp__doc__, "posix_spawnp($module, path, argv, env, /, *, file_actions=(),\n" -" setpgroup=None, resetids=False, setsigmask=(),\n" -" setsigdef=(), scheduler=None)\n" +" setpgroup=None, resetids=False, setsid=False,\n" +" setsigmask=(), setsigdef=(), scheduler=None)\n" "--\n" "\n" "Execute the program specified by path in a new process.\n" @@ -1813,6 +1817,8 @@ PyDoc_STRVAR(os_posix_spawnp__doc__, " The pgroup to use with the POSIX_SPAWN_SETPGROUP flag.\n" " resetids\n" " If the value is `True` the POSIX_SPAWN_RESETIDS will be activated.\n" +" setsid\n" +" If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated.\n" " setsigmask\n" " The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag.\n" " setsigdef\n" @@ -1826,30 +1832,32 @@ PyDoc_STRVAR(os_posix_spawnp__doc__, static PyObject * os_posix_spawnp_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env, PyObject *file_actions, - PyObject *setpgroup, int resetids, PyObject *setsigmask, - PyObject *setsigdef, PyObject *scheduler); + PyObject *setpgroup, int resetids, int setsid, + PyObject *setsigmask, PyObject *setsigdef, + PyObject *scheduler); static PyObject * os_posix_spawnp(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames) { PyObject *return_value = NULL; - static const char * const _keywords[] = {"", "", "", "file_actions", "setpgroup", "resetids", "setsigmask", "setsigdef", "scheduler", NULL}; - static _PyArg_Parser _parser = {"O&OO|$OOiOOO:posix_spawnp", _keywords, 0}; + static const char * const _keywords[] = {"", "", "", "file_actions", "setpgroup", "resetids", "setsid", "setsigmask", "setsigdef", "scheduler", NULL}; + static _PyArg_Parser _parser = {"O&OO|$OOiiOOO:posix_spawnp", _keywords, 0}; path_t path = PATH_T_INITIALIZE("posix_spawnp", "path", 0, 0); PyObject *argv; PyObject *env; PyObject *file_actions = NULL; PyObject *setpgroup = NULL; int resetids = 0; + int setsid = 0; PyObject *setsigmask = NULL; PyObject *setsigdef = NULL; PyObject *scheduler = NULL; if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser, - path_converter, &path, &argv, &env, &file_actions, &setpgroup, &resetids, &setsigmask, &setsigdef, &scheduler)) { + path_converter, &path, &argv, &env, &file_actions, &setpgroup, &resetids, &setsid, &setsigmask, &setsigdef, &scheduler)) { goto exit; } - return_value = os_posix_spawnp_impl(module, &path, argv, env, file_actions, setpgroup, resetids, setsigmask, setsigdef, scheduler); + return_value = os_posix_spawnp_impl(module, &path, argv, env, file_actions, setpgroup, resetids, setsid, setsigmask, setsigdef, scheduler); exit: /* Cleanup for path */ @@ -7331,4 +7339,4 @@ os_getrandom(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject #ifndef OS_GETRANDOM_METHODDEF #define OS_GETRANDOM_METHODDEF #endif /* !defined(OS_GETRANDOM_METHODDEF) */ -/*[clinic end generated code: output=dabd0fa27bf87044 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=d50ff73e5b5198b9 input=a9049054013a1b77]*/ diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index b25b5220cdb3..e516b5bed33a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5166,10 +5166,11 @@ convert_sched_param(PyObject *param, struct sched_param *res); #endif static int -parse_posix_spawn_flags(PyObject *setpgroup, int resetids, PyObject *setsigmask, +parse_posix_spawn_flags(PyObject *setpgroup, int resetids, int setsid, PyObject *setsigmask, PyObject *setsigdef, PyObject *scheduler, posix_spawnattr_t *attrp) { + const char *func_name = "posix_spawnp"; long all_flags = 0; errno = posix_spawnattr_init(attrp); @@ -5195,6 +5196,17 @@ parse_posix_spawn_flags(PyObject *setpgroup, int resetids, PyObject *setsigmask, all_flags |= POSIX_SPAWN_RESETIDS; } + if (setsid) { +#ifdef POSIX_SPAWN_SETSID + all_flags |= POSIX_SPAWN_SETSID; +#elif defined(POSIX_SPAWN_SETSID_NP) + all_flags |= POSIX_SPAWN_SETSID_NP; +#else + argument_unavailable_error(func_name, "setsid"); + return -1; +#endif + } + if (setsigmask) { sigset_t set; if (!_Py_Sigset_Converter(setsigmask, &set)) { @@ -5385,7 +5397,7 @@ parse_file_actions(PyObject *file_actions, static PyObject * py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *argv, PyObject *env, PyObject *file_actions, - PyObject *setpgroup, int resetids, PyObject *setsigmask, + PyObject *setpgroup, int resetids, int setsid, PyObject *setsigmask, PyObject *setsigdef, PyObject *scheduler) { EXECV_CHAR **argvlist = NULL; @@ -5400,7 +5412,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a pid_t pid; int err_code; - /* posix_spawn has three arguments: (path, argv, env), where + /* posix_spawn and posix_spawnp have three arguments: (path, argv, env), where argv is a list or tuple of strings and env is a dictionary like posix.environ. */ @@ -5455,7 +5467,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a file_actionsp = &file_actions_buf; } - if (parse_posix_spawn_flags(setpgroup, resetids, setsigmask, + if (parse_posix_spawn_flags(setpgroup, resetids, setsid, setsigmask, setsigdef, scheduler, &attr)) { goto exit; } @@ -5519,7 +5531,9 @@ os.posix_spawn setpgroup: object = NULL The pgroup to use with the POSIX_SPAWN_SETPGROUP flag. resetids: bool(accept={int}) = False - If the value is `True` the POSIX_SPAWN_RESETIDS will be activated. + If the value is `true` the POSIX_SPAWN_RESETIDS will be activated. + setsid: bool(accept={int}) = False + If the value is `true` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated. setsigmask: object(c_default='NULL') = () The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag. setsigdef: object(c_default='NULL') = () @@ -5533,12 +5547,13 @@ Execute the program specified by path in a new process. static PyObject * os_posix_spawn_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env, PyObject *file_actions, - PyObject *setpgroup, int resetids, PyObject *setsigmask, - PyObject *setsigdef, PyObject *scheduler) -/*[clinic end generated code: output=45dfa4c515d09f2c input=2891c2f1d457e39b]*/ + PyObject *setpgroup, int resetids, int setsid, + PyObject *setsigmask, PyObject *setsigdef, + PyObject *scheduler) +/*[clinic end generated code: output=14a1098c566bc675 input=8c6305619a00ad04]*/ { return py_posix_spawn(0, module, path, argv, env, file_actions, - setpgroup, resetids, setsigmask, setsigdef, + setpgroup, resetids, setsid, setsigmask, setsigdef, scheduler); } #endif /* HAVE_POSIX_SPAWN */ @@ -5563,6 +5578,8 @@ os.posix_spawnp The pgroup to use with the POSIX_SPAWN_SETPGROUP flag. resetids: bool(accept={int}) = False If the value is `True` the POSIX_SPAWN_RESETIDS will be activated. + setsid: bool(accept={int}) = False + If the value is `True` the POSIX_SPAWN_SETSID or POSIX_SPAWN_SETSID_NP will be activated. setsigmask: object(c_default='NULL') = () The sigmask to use with the POSIX_SPAWN_SETSIGMASK flag. setsigdef: object(c_default='NULL') = () @@ -5576,12 +5593,13 @@ Execute the program specified by path in a new process. static PyObject * os_posix_spawnp_impl(PyObject *module, path_t *path, PyObject *argv, PyObject *env, PyObject *file_actions, - PyObject *setpgroup, int resetids, PyObject *setsigmask, - PyObject *setsigdef, PyObject *scheduler) -/*[clinic end generated code: output=7955dc0edc82b8c3 input=b7576eb25b1ed9eb]*/ + PyObject *setpgroup, int resetids, int setsid, + PyObject *setsigmask, PyObject *setsigdef, + PyObject *scheduler) +/*[clinic end generated code: output=7b9aaefe3031238d input=c1911043a22028da]*/ { return py_posix_spawn(1, module, path, argv, env, file_actions, - setpgroup, resetids, setsigmask, setsigdef, + setpgroup, resetids, setsid, setsigmask, setsigdef, scheduler); } #endif /* HAVE_POSIX_SPAWNP */

1 0

Daily reference leaks (4243df51fe43): sum=-3
by solipsis＠pitrou.net Feb. 1, 2019

Feb. 1, 2019

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

1 0