Mailman 3 November 2011 - Python-checkins

cpython (merge 3.2 -> default): Issue #7111: Python can now be run without a stdin, stdout or stderr stream.
by antoine.pitrou Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/cpython/rev/c86fb10eaf68 changeset: 73776:c86fb10eaf68 parent: 73774:e3647275f468 parent: 73775:f15943505db0 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Nov 28 19:09:45 2011 +0100 summary: Issue #7111: Python can now be run without a stdin, stdout or stderr stream. It was already the case with Python 2. However, the corresponding sys module entries are now set to None (instead of an unusable file object). files: Lib/test/test_cmd_line.py | 39 +++++++++++++++++++++++++++ Misc/NEWS | 4 ++ Python/pythonrun.c | 31 +++++++++++---------- 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -285,6 +285,45 @@ rc, out, err = assert_python_ok('-c', code) self.assertEqual(b'', err) + # Issue #7111: Python should work without standard streams + + @unittest.skipIf(os.name != 'posix', "test needs POSIX semantics") + def _test_no_stdio(self, streams): + code = """if 1: + import os, sys + for i, s in enumerate({streams}): + if getattr(sys, s) is not None: + os._exit(i + 1) + os._exit(42)""".format(streams=streams) + def preexec(): + if 'stdin' in streams: + os.close(0) + if 'stdout' in streams: + os.close(1) + if 'stderr' in streams: + os.close(2) + p = subprocess.Popen( + [sys.executable, "-E", "-c", code], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + preexec_fn=preexec) + out, err = p.communicate() + self.assertEqual(test.support.strip_python_stderr(err), b'') + self.assertEqual(p.returncode, 42) + + def test_no_stdin(self): + self._test_no_stdio(['stdin']) + + def test_no_stdout(self): + self._test_no_stdio(['stdout']) + + def test_no_stderr(self): + self._test_no_stdio(['stderr']) + + def test_no_std_streams(self): + self._test_no_stdio(['stdin', 'stdout', 'stderr']) + def test_main(): test.support.run_unittest(CmdLineTest) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + - Issue #11849: Ensure that free()d memory arenas are really released on POSIX systems supporting anonymous memory mappings. Patch by Charles-François Natali. diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -912,6 +912,19 @@ return NULL; } +static int +is_valid_fd(int fd) +{ + int dummy_fd; + if (fd < 0 || !_PyVerify_fd(fd)) + return 0; + dummy_fd = dup(fd); + if (dummy_fd < 0) + return 0; + close(dummy_fd); + return 1; +} + /* Initialize sys.stdin, stdout, stderr and builtins.open */ static int initstdio(void) @@ -971,13 +984,9 @@ * and fileno() may point to an invalid file descriptor. For example * GUI apps don't have valid standard streams by default. */ - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 0, "<stdin>", encoding, errors); @@ -990,13 +999,9 @@ /* Set sys.stdout */ fd = fileno(stdout); - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 1, "<stdout>", encoding, errors); @@ -1010,13 +1015,9 @@ #if 1 /* Disable this if you have trouble debugging bootstrap stuff */ /* Set sys.stderr, replaces the preliminary stderr */ fd = fileno(stderr); - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 1, "<stderr>", encoding, "backslashreplace"); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #7111: Python can now be run without a stdin, stdout or stderr stream.
by antoine.pitrou Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/cpython/rev/f15943505db0 changeset: 73775:f15943505db0 branch: 3.2 parent: 73773:661fb211f220 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Nov 28 19:08:36 2011 +0100 summary: Issue #7111: Python can now be run without a stdin, stdout or stderr stream. It was already the case with Python 2. However, the corresponding sys module entries are now set to None (instead of an unusable file object). files: Lib/test/test_cmd_line.py | 39 +++++++++++++++++++++++++++ Misc/NEWS | 4 ++ Python/pythonrun.c | 31 +++++++++++---------- 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -291,6 +291,45 @@ rc, out, err = assert_python_ok('-c', code) self.assertEqual(b'', err) + # Issue #7111: Python should work without standard streams + + @unittest.skipIf(os.name != 'posix', "test needs POSIX semantics") + def _test_no_stdio(self, streams): + code = """if 1: + import os, sys + for i, s in enumerate({streams}): + if getattr(sys, s) is not None: + os._exit(i + 1) + os._exit(42)""".format(streams=streams) + def preexec(): + if 'stdin' in streams: + os.close(0) + if 'stdout' in streams: + os.close(1) + if 'stderr' in streams: + os.close(2) + p = subprocess.Popen( + [sys.executable, "-E", "-c", code], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + preexec_fn=preexec) + out, err = p.communicate() + self.assertEqual(test.support.strip_python_stderr(err), b'') + self.assertEqual(p.returncode, 42) + + def test_no_stdin(self): + self._test_no_stdio(['stdin']) + + def test_no_stdout(self): + self._test_no_stdio(['stdout']) + + def test_no_stderr(self): + self._test_no_stdio(['stderr']) + + def test_no_std_streams(self): + self._test_no_stdio(['stdin', 'stdout', 'stderr']) + def test_main(): test.support.run_unittest(CmdLineTest) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Core and Builtins ----------------- +- Issue #7111: Python can now be run without a stdin, stdout or stderr + stream. It was already the case with Python 2. However, the corresponding + sys module entries are now set to None (instead of an unusable file object). + - Issue #13436: Fix a bogus error message when an AST object was passed an invalid integer value. diff --git a/Python/pythonrun.c b/Python/pythonrun.c --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -892,6 +892,19 @@ return NULL; } +static int +is_valid_fd(int fd) +{ + int dummy_fd; + if (fd < 0 || !_PyVerify_fd(fd)) + return 0; + dummy_fd = dup(fd); + if (dummy_fd < 0) + return 0; + close(dummy_fd); + return 1; +} + /* Initialize sys.stdin, stdout, stderr and builtins.open */ static int initstdio(void) @@ -951,13 +964,9 @@ * and fileno() may point to an invalid file descriptor. For example * GUI apps don't have valid standard streams by default. */ - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 0, "<stdin>", encoding, errors); @@ -970,13 +979,9 @@ /* Set sys.stdout */ fd = fileno(stdout); - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 1, "<stdout>", encoding, errors); @@ -990,13 +995,9 @@ #if 1 /* Disable this if you have trouble debugging bootstrap stuff */ /* Set sys.stderr, replaces the preliminary stderr */ fd = fileno(stderr); - if (fd < 0) { -#ifdef MS_WINDOWS + if (!is_valid_fd(fd)) { std = Py_None; Py_INCREF(std); -#else - goto error; -#endif } else { std = create_stdio(iomod, fd, 1, "<stderr>", encoding, "backslashreplace"); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #12618: py_compile cannot create files in current directory
by meador.inge Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/cpython/rev/e3647275f468 changeset: 73774:e3647275f468 parent: 73772:bf51e32b2a81 parent: 73773:661fb211f220 user: Meador Inge <meadori(a)gmail.com> date: Mon Nov 28 09:34:47 2011 -0600 summary: Issue #12618: py_compile cannot create files in current directory Initial patch by Sjoerd de Vries. files: Lib/py_compile.py | 4 +++- Lib/test/test_py_compile.py | 9 +++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Lib/py_compile.py b/Lib/py_compile.py --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -130,7 +130,9 @@ else: cfile = imp.cache_from_source(file) try: - os.makedirs(os.path.dirname(cfile)) + dirname = os.path.dirname(cfile) + if dirname: + os.makedirs(dirname) except OSError as error: if error.errno != errno.EEXIST: raise diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py --- a/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py @@ -39,6 +39,15 @@ py_compile.compile(self.source_path) self.assertTrue(os.path.exists(self.cache_path)) + def test_cwd(self): + cwd = os.getcwd() + os.chdir(self.directory) + py_compile.compile(os.path.basename(self.source_path), + os.path.basename(self.pyc_path)) + os.chdir(cwd) + self.assertTrue(os.path.exists(self.pyc_path)) + self.assertFalse(os.path.exists(self.cache_path)) + def test_relative_path(self): py_compile.compile(os.path.relpath(self.source_path), os.path.relpath(self.pyc_path)) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1014,6 +1014,7 @@ Kurt Vile Norman Vine Frank Visser +Sjoerd de Vries Niki W. Waibel Wojtek Walczak Charles Waldman diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -395,6 +395,9 @@ Library ------- +- Issue #12618: Fix a bug that prevented py_compile from creating byte + compiled files in the current directory. Initial patch by Sjoerd de Vries. + - Issue #13444: When stdout has been closed explicitly, we should not attempt to flush it at shutdown and print an error. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12618: py_compile cannot create files in current directory
by meador.inge Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/cpython/rev/661fb211f220 changeset: 73773:661fb211f220 branch: 3.2 parent: 73768:bceb6aea8554 user: Meador Inge <meadori(a)gmail.com> date: Mon Nov 28 09:27:32 2011 -0600 summary: Issue #12618: py_compile cannot create files in current directory Initial patch by Sjoerd de Vries. files: Lib/py_compile.py | 4 +++- Lib/test/test_py_compile.py | 9 +++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Lib/py_compile.py b/Lib/py_compile.py --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -130,7 +130,9 @@ else: cfile = imp.cache_from_source(file) try: - os.makedirs(os.path.dirname(cfile)) + dirname = os.path.dirname(cfile) + if dirname: + os.makedirs(dirname) except OSError as error: if error.errno != errno.EEXIST: raise diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py --- a/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py @@ -39,6 +39,15 @@ py_compile.compile(self.source_path) self.assertTrue(os.path.exists(self.cache_path)) + def test_cwd(self): + cwd = os.getcwd() + os.chdir(self.directory) + py_compile.compile(os.path.basename(self.source_path), + os.path.basename(self.pyc_path)) + os.chdir(cwd) + self.assertTrue(os.path.exists(self.pyc_path)) + self.assertFalse(os.path.exists(self.cache_path)) + def test_relative_path(self): py_compile.compile(os.path.relpath(self.source_path), os.path.relpath(self.pyc_path)) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -941,6 +941,7 @@ Kurt Vile Norman Vine Frank Visser +Sjoerd de Vries Niki W. Waibel Wojtek Walczak Charles Waldman diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -83,6 +83,9 @@ Library ------- +- Issue #12618: Fix a bug that prevented py_compile from creating byte + compiled files in the current directory. Initial patch by Sjoerd de Vries. + - Issue #13444: When stdout has been closed explicitly, we should not attempt to flush it at shutdown and print an error. -- Repository URL: http://hg.python.org/cpython

1 0

peps: Add a make dependency on PEP index generator code to generated file
by eric.araujo Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/peps/rev/1b7fed04108c changeset: 4004:1b7fed04108c user: Éric Araujo <merwok(a)netwok.org> date: Mon Nov 28 15:07:42 2011 +0100 summary: Add a make dependency on PEP index generator code to generated file files: Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ $(TARGETS): pep2html.py -pep-0000.txt: $(wildcard pep-????.txt) +pep-0000.txt: $(wildcard pep-????.txt) $(wildcard pep0/*.py) $(PYTHON) genpepindex.py . install: -- Repository URL: http://hg.python.org/peps

1 0

cpython: Issue #13415: test_curses skips unencodable characters
by victor.stinner Nov. 28, 2011

Nov. 28, 2011

http://hg.python.org/cpython/rev/bf51e32b2a81 changeset: 73772:bf51e32b2a81 parent: 73769:f4e3ae988a70 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Mon Nov 28 07:26:19 2011 +0100 summary: Issue #13415: test_curses skips unencodable characters files: Lib/test/test_curses.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py --- a/Lib/test/test_curses.py +++ b/Lib/test/test_curses.py @@ -267,11 +267,18 @@ def test_unget_wch(stdscr): if not hasattr(curses, 'unget_wch'): return + import locale + encoding = locale.getpreferredencoding() for ch in ('a', '\xe9', '\u20ac', '\U0010FFFF'): try: + ch.encode(encoding) + except UnicodeEncodeError: + continue + try: curses.unget_wch(ch) except Exception as err: - raise Exception("unget_wch(%a) failed: %s" % (ch, err)) + raise Exception("unget_wch(%a) failed with locale encoding %s: %s" + % (ch, encoding, err)) read = stdscr.get_wch() read = chr(read) if read != ch: -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (f4e3ae988a70): sum=0
by solipsis＠pitrou.net Nov. 28, 2011

Nov. 28, 2011

results for f4e3ae988a70 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog_1kzUX', '-x']

1 0

r88927 - tracker/instances/python-dev/extensions/openid_login.py
by martin.v.loewis Nov. 27, 2011

Nov. 27, 2011

Author: martin.v.loewis Date: Mon Nov 28 00:47:42 2011 New Revision: 88927 Log: Fix minor bug. Modified: tracker/instances/python-dev/extensions/openid_login.py Modified: tracker/instances/python-dev/extensions/openid_login.py ============================================================================== --- tracker/instances/python-dev/extensions/openid_login.py (original) +++ tracker/instances/python-dev/extensions/openid_login.py Mon Nov 28 00:47:42 2011 @@ -164,6 +164,7 @@ result = openid2rp.discover(provider_id) if result is None: self.client.error_message.append('Provider %s appears to be down' % providers[provider][0]) + return services, op_endpoint, op_local = result session = self.get_session(op_endpoint, services) try:

1 0

r88926 - tracker/instances/python-dev/extensions/openid_login.py
by martin.v.loewis Nov. 27, 2011

Nov. 27, 2011

Author: martin.v.loewis Date: Sun Nov 27 23:42:26 2011 New Revision: 88926 Log: Catch failed discovery of builtin providers. Modified: tracker/instances/python-dev/extensions/openid_login.py Modified: tracker/instances/python-dev/extensions/openid_login.py ============================================================================== --- tracker/instances/python-dev/extensions/openid_login.py (original) +++ tracker/instances/python-dev/extensions/openid_login.py Sun Nov 27 23:42:26 2011 @@ -161,7 +161,10 @@ # results. However, the risk of login breaking if a provider does change # its service URL outweighs the cost of another HTTP request to perform # the discovery during login. - services, op_endpoint, op_local = openid2rp.discover(provider_id) + result = openid2rp.discover(provider_id) + if result is None: + self.client.error_message.append('Provider %s appears to be down' % providers[provider][0]) + services, op_endpoint, op_local = result session = self.get_session(op_endpoint, services) try: session = self.get_session(op_endpoint, services)

1 0

cpython (2.7): Issue #13415: Test in configure if unsetenv() has a return value or not.
by charles-francois.natali Nov. 27, 2011

Nov. 27, 2011

http://hg.python.org/cpython/rev/11bbeaf03894 changeset: 73770:11bbeaf03894 branch: 2.7 parent: 73758:b23453530d5f user: Charles-François Natali <neologix(a)free.fr> date: Sun Nov 27 13:01:35 2011 +0100 summary: Issue #13415: Test in configure if unsetenv() has a return value or not. files: Modules/posixmodule.c | 6 ++++++ configure | 28 ++++++++++++++++++++++++++++ configure.in | 9 +++++++++ pyconfig.h.in | 3 +++ 4 files changed, 46 insertions(+), 0 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -7044,14 +7044,20 @@ posix_unsetenv(PyObject *self, PyObject *args) { char *s1; +#ifndef HAVE_BROKEN_UNSETENV int err; +#endif if (!PyArg_ParseTuple(args, "s:unsetenv", &s1)) return NULL; +#ifdef HAVE_BROKEN_UNSETENV + unsetenv(s1); +#else err = unsetenv(s1); if (err) return posix_error(); +#endif /* Remove the key from posix_putenv_garbage; * this will cause it to be collected. This has to diff --git a/configure b/configure --- a/configure +++ b/configure @@ -9924,6 +9924,34 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unsetenv" >&5 +$as_echo_n "checking for broken unsetenv... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> + +int +main () +{ +int res = unsetenv("DUMMY") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + +$as_echo "#define HAVE_BROKEN_UNSETENV 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + for ac_prog in true do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -2831,6 +2831,15 @@ [AC_MSG_RESULT(no) ]) +AC_MSG_CHECKING(for broken unsetenv) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <stdlib.h> +]], [[int res = unsetenv("DUMMY")]])], + [AC_MSG_RESULT(no)], + [AC_DEFINE(HAVE_BROKEN_UNSETENV, 1, Define if `unsetenv` does not return an int.) + AC_MSG_RESULT(yes) +]) + dnl check for true AC_CHECK_PROGS(TRUE, true, /bin/true) diff --git a/pyconfig.h.in b/pyconfig.h.in --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -97,6 +97,9 @@ /* define to 1 if your sem_getvalue is broken. */ #undef HAVE_BROKEN_SEM_GETVALUE +/* Define if `unsetenv` does not return an int. */ +#undef HAVE_BROKEN_UNSETENV + /* Define this if you have the type _Bool. */ #undef HAVE_C99_BOOL -- Repository URL: http://hg.python.org/cpython

1 0