Mailman 3 January 2020 - Python-checkins

bpo-39459: include missing test files in windows installer
by Dino Viehland Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/0cd5bff6b7da3118d0c5a88fc2b80f80eb… commit: 0cd5bff6b7da3118d0c5a88fc2b80f80eb7c3059 branch: master author: Dino Viehland <dinoviehland(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T13:24:12-08:00 summary: bpo-39459: include missing test files in windows installer Adds missing test files to Windows installer to wrap up bpo-39459 files: M PCbuild/lib.pyproj diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj index 401e207ae57e8..d4351dec3bee2 100644 --- a/PCbuild/lib.pyproj +++ b/PCbuild/lib.pyproj @@ -1125,6 +1125,8 @@ <Compile Include="test\test_import\data\package\submodule.py" /> <Compile Include="test\test_import\data\package2\submodule1.py" /> <Compile Include="test\test_import\data\package2\submodule2.py" /> + <Compile Include="test\test_import\data\unwritable\__init__.py" /> + <Compile Include="test\test_import\data\unwritable\x.py" /> <Compile Include="test\test_import\__init__.py" /> <Compile Include="test\test_import\__main__.py" /> <Compile Include="test\test_index.py" />

1 0

bpo-38960: DTrace build fix for FreeBSD. (GH-17451)
by Petr Viktorin Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/aabdeb766b7fa581e7de01f3c953b12792… commit: aabdeb766b7fa581e7de01f3c953b12792f0736d branch: master author: David Carlier <dcarlier(a)afilias.info> committer: Petr Viktorin <encukou(a)gmail.com> date: 2020-01-28T13:53:32+01:00 summary: bpo-38960: DTrace build fix for FreeBSD. (GH-17451) DTrace build fix for FreeBSD. - allowing passing an extra flag as it need to define the arch size. - casting some probe's arguments. files: A Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst M Python/ceval.c M Python/import.c M Python/sysmodule.c M configure M configure.ac diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst new file mode 100644 index 0000000000000..50d4b6c286843 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst @@ -0,0 +1 @@ +Fix DTrace build issues on FreeBSD. Patch by David Carlier. diff --git a/Python/ceval.c b/Python/ceval.c index 2c0a23dfdd291..2770dc6d08dd2 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5447,7 +5447,7 @@ dtrace_function_entry(PyFrameObject *f) funcname = PyUnicode_AsUTF8(f->f_code->co_name); lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); - PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno); + PyDTrace_FUNCTION_ENTRY((char *)filename, (char *)funcname, lineno); } static void @@ -5461,7 +5461,7 @@ dtrace_function_return(PyFrameObject *f) funcname = PyUnicode_AsUTF8(f->f_code->co_name); lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); - PyDTrace_FUNCTION_RETURN(filename, funcname, lineno); + PyDTrace_FUNCTION_RETURN((char *)filename, (char *)funcname, lineno); } /* DTrace equivalent of maybe_call_line_trace. */ @@ -5493,7 +5493,7 @@ maybe_dtrace_line(PyFrameObject *frame, co_name = PyUnicode_AsUTF8(frame->f_code->co_name); if (!co_name) co_name = "?"; - PyDTrace_LINE(co_filename, co_name, line); + PyDTrace_LINE((char *)co_filename, (char *)co_name, line); } *instr_prev = frame->f_lasti; } diff --git a/Python/import.c b/Python/import.c index 045b6d0a9bf6f..2e5f78382ed44 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1762,14 +1762,14 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name) } if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED()) - PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name)); + PyDTrace_IMPORT_FIND_LOAD_START((char *)PyUnicode_AsUTF8(abs_name)); mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__find_and_load, abs_name, interp->import_func, NULL); if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED()) - PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name), + PyDTrace_IMPORT_FIND_LOAD_DONE((char *)PyUnicode_AsUTF8(abs_name), mod != NULL); if (import_time) { diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 9f866a2a3d2fa..17e79603c29f4 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -204,7 +204,7 @@ PySys_Audit(const char *event, const char *argFormat, ...) /* Dtrace USDT point */ if (dtrace) { - PyDTrace_AUDIT(event, (void *)eventArgs); + PyDTrace_AUDIT((char *)event, (void *)eventArgs); } /* Call interpreter hooks */ diff --git a/configure b/configure index 85120e498d1fa..595c129814d29 100755 --- a/configure +++ b/configure @@ -11386,7 +11386,6 @@ $as_echo "$with_dtrace" >&6; } DTRACE= -DFLAGS= DTRACE_HEADERS= DTRACE_OBJS= @@ -11452,7 +11451,7 @@ if ${ac_cv_dtrace_link+:} false; then : else ac_cv_dtrace_link=no echo 'BEGIN{}' > conftest.d - "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ + "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ ac_cv_dtrace_link=yes fi diff --git a/configure.ac b/configure.ac index ab8e1b7d27ac2..fee605eec2aa5 100644 --- a/configure.ac +++ b/configure.ac @@ -3500,7 +3500,6 @@ AC_SUBST(DFLAGS) AC_SUBST(DTRACE_HEADERS) AC_SUBST(DTRACE_OBJS) DTRACE= -DFLAGS= DTRACE_HEADERS= DTRACE_OBJS= @@ -3521,7 +3520,7 @@ then [ac_cv_dtrace_link], [dnl ac_cv_dtrace_link=no echo 'BEGIN{}' > conftest.d - "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ + "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ ac_cv_dtrace_link=yes ]) if test "$ac_cv_dtrace_link" = "yes"; then

1 0

bpo-36350: inspect: Replace OrderedDict with dict. (GH-12412)
by Inada Naoki Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/2cca8efe46935c39c445f585bce54954fa… commit: 2cca8efe46935c39c445f585bce54954fad2485b branch: master author: Rémi Lapeyre <remi.lapeyre(a)henki.fr> committer: Inada Naoki <songofacandy(a)gmail.com> date: 2020-01-28T21:47:03+09:00 summary: bpo-36350: inspect: Replace OrderedDict with dict. (GH-12412) files: A Misc/NEWS.d/next/Library/2019-03-18-16-17-59.bpo-36350.udRSWE.rst M Doc/library/inspect.rst M Lib/inspect.py M Lib/test/test_inspect.py diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index bab2c41e4e224..9b9bc99f43d48 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -624,15 +624,18 @@ function. .. attribute:: Signature.parameters - An ordered mapping of parameters' names to the corresponding - :class:`Parameter` objects. Parameters appear in strict definition - order, including keyword-only parameters. + An dictionary of :class:`Parameter` objects. Parameters appear in strict + definition order, including keyword-only parameters. .. versionchanged:: 3.7 Python only explicitly guaranteed that it preserved the declaration order of keyword-only parameters as of version 3.7, although in practice this order had always been preserved in Python 3. + .. versionchanged:: 3.9 + :attr:`parameters` is now of type :class:`dict`. Formerly, it was of + type :class:`collections.OrderedDict`. + .. attribute:: Signature.return_annotation The "return" annotation for the callable. If the callable has no "return" @@ -821,10 +824,9 @@ function. .. attribute:: BoundArguments.arguments - An ordered, mutable mapping (:class:`collections.OrderedDict`) of - parameters' names to arguments' values. Contains only explicitly bound - arguments. Changes in :attr:`arguments` will reflect in :attr:`args` and - :attr:`kwargs`. + An ordered, mutable mapping of parameters' names to arguments' values. + Contains only explicitly bound arguments. Changes in :attr:`arguments` + will reflect in :attr:`args` and :attr:`kwargs`. Should be used in conjunction with :attr:`Signature.parameters` for any argument processing purposes. @@ -836,6 +838,10 @@ function. However, if needed, use :meth:`BoundArguments.apply_defaults` to add them. + .. versionchanged:: 3.9 + :attr:`arguments` is now of type :class:`dict`. Formerly, it was of + type :class:`collections.OrderedDict`. + .. attribute:: BoundArguments.args A tuple of positional arguments values. Dynamically computed from the @@ -866,7 +872,7 @@ function. >>> ba = inspect.signature(foo).bind('spam') >>> ba.apply_defaults() >>> ba.arguments - OrderedDict([('a', 'spam'), ('b', 'ham'), ('args', ())]) + {'a': 'spam', 'b': 'ham', 'args': ()} .. versionadded:: 3.5 diff --git a/Lib/inspect.py b/Lib/inspect.py index 608ca9551160e..950bdb221798d 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -48,7 +48,7 @@ import functools import builtins from operator import attrgetter -from collections import namedtuple, OrderedDict +from collections import namedtuple # Create constants for the compiler flags in Include/code.h # We try to get them from dis to avoid duplication @@ -1727,7 +1727,7 @@ def _signature_get_partial(wrapped_sig, partial, extra_args=()): """ old_params = wrapped_sig.parameters - new_params = OrderedDict(old_params.items()) + new_params = {} partial_args = partial.args or () partial_keywords = partial.keywords or {} @@ -1743,6 +1743,7 @@ def _signature_get_partial(wrapped_sig, partial, extra_args=()): transform_to_kwonly = False + kwonly_params = {} # Keyword only parameters are moved to end. for param_name, param in old_params.items(): try: arg_value = ba.arguments[param_name] @@ -1752,7 +1753,6 @@ def _signature_get_partial(wrapped_sig, partial, extra_args=()): if param.kind is _POSITIONAL_ONLY: # If positional-only parameter is bound by partial, # it effectively disappears from the signature - new_params.pop(param_name) continue if param.kind is _POSITIONAL_OR_KEYWORD: @@ -1771,28 +1771,26 @@ def _signature_get_partial(wrapped_sig, partial, extra_args=()): # multiple values. transform_to_kwonly = True # Set the new default value - new_params[param_name] = param.replace(default=arg_value) + param = param.replace(default=arg_value) else: # was passed as a positional argument - new_params.pop(param.name) continue if param.kind is _KEYWORD_ONLY: # Set the new default value - new_params[param_name] = param.replace(default=arg_value) + param = param.replace(default=arg_value) if transform_to_kwonly: assert param.kind is not _POSITIONAL_ONLY if param.kind is _POSITIONAL_OR_KEYWORD: - new_param = new_params[param_name].replace(kind=_KEYWORD_ONLY) - new_params[param_name] = new_param - new_params.move_to_end(param_name) + kwonly_params[param_name] = param.replace(kind=_KEYWORD_ONLY) elif param.kind in (_KEYWORD_ONLY, _VAR_KEYWORD): - new_params.move_to_end(param_name) - elif param.kind is _VAR_POSITIONAL: - new_params.pop(param.name) + kwonly_params[param_name] = param + else: + new_params[param_name] = param + new_params.update(kwonly_params) return wrapped_sig.replace(parameters=new_params.values()) @@ -2602,7 +2600,7 @@ class BoundArguments: Has the following public attributes: - * arguments : OrderedDict + * arguments : dict An ordered mutable mapping of parameters' names to arguments' values. Does not contain arguments' default values. * signature : Signature @@ -2702,7 +2700,7 @@ def apply_defaults(self): # Signature.bind_partial(). continue new_arguments.append((name, val)) - self.arguments = OrderedDict(new_arguments) + self.arguments = dict(new_arguments) def __eq__(self, other): if self is other: @@ -2733,7 +2731,7 @@ class Signature: A Signature object has the following public attributes and methods: - * parameters : OrderedDict + * parameters : dict An ordered mapping of parameters' names to the corresponding Parameter objects (keyword-only arguments are in the same order as listed in `code.co_varnames`). @@ -2763,14 +2761,14 @@ def __init__(self, parameters=None, *, return_annotation=_empty, """ if parameters is None: - params = OrderedDict() + params = {} else: if __validate_parameters__: - params = OrderedDict() + params = {} top_kind = _POSITIONAL_ONLY kind_defaults = False - for idx, param in enumerate(parameters): + for param in parameters: kind = param.kind name = param.name @@ -2805,8 +2803,7 @@ def __init__(self, parameters=None, *, return_annotation=_empty, params[name] = param else: - params = OrderedDict(((param.name, param) - for param in parameters)) + params = {param.name: param for param in parameters} self._parameters = types.MappingProxyType(params) self._return_annotation = return_annotation @@ -2888,7 +2885,7 @@ def __eq__(self, other): def _bind(self, args, kwargs, *, partial=False): """Private method. Don't use directly.""" - arguments = OrderedDict() + arguments = {} parameters = iter(self.parameters.values()) parameters_ex = () diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index d95e742c8dd64..8a2efc879323f 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -2077,6 +2077,7 @@ def test_signature_object(self): P = inspect.Parameter self.assertEqual(str(S()), '()') + self.assertEqual(repr(S().parameters), 'mappingproxy({})') def test(po, pk, pod=42, pkd=100, *args, ko, **kwargs): pass @@ -3681,6 +3682,10 @@ def foo(a='spam'): pass ba.apply_defaults() self.assertEqual(list(ba.arguments.items()), [('a', 'spam')]) + def test_signature_bound_arguments_arguments_type(self): + def foo(a): pass + ba = inspect.signature(foo).bind(1) + self.assertIs(type(ba.arguments), dict) class TestSignaturePrivateHelpers(unittest.TestCase): def test_signature_get_bound_param(self): diff --git a/Misc/NEWS.d/next/Library/2019-03-18-16-17-59.bpo-36350.udRSWE.rst b/Misc/NEWS.d/next/Library/2019-03-18-16-17-59.bpo-36350.udRSWE.rst new file mode 100644 index 0000000000000..43363fce1652c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-03-18-16-17-59.bpo-36350.udRSWE.rst @@ -0,0 +1,2 @@ +`inspect.Signature.parameters` and `inspect.BoundArguments.arguments` are +now dicts instead of OrderedDicts. Patch contributed by Rémi Lapeyre.

1 0

bpo-39439: Fix multiprocessing spawn path in a venv on Windows (GH-18158)
by Miss Islington (bot) Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/dbb37aac1428ddcba784d9ddc77c1708c3… commit: dbb37aac1428ddcba784d9ddc77c1708c391aa80 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T02:52:47-08:00 summary: bpo-39439: Fix multiprocessing spawn path in a venv on Windows (GH-18158) (cherry picked from commit 0be3246d4f9c8eddcd55491901d95b09fe163f15) Co-authored-by: Adam Meily <ameily(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst M Lib/multiprocessing/spawn.py diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py index 075f3455478b5..7cc129e261076 100644 --- a/Lib/multiprocessing/spawn.py +++ b/Lib/multiprocessing/spawn.py @@ -36,7 +36,7 @@ if WINSERVICE: _python_exe = os.path.join(sys.exec_prefix, 'python.exe') else: - _python_exe = sys._base_executable + _python_exe = sys.executable def set_executable(exe): global _python_exe diff --git a/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst b/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst new file mode 100644 index 0000000000000..d677c4c3e02d5 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst @@ -0,0 +1 @@ +Honor the Python path when a virtualenv is active on Windows. \ No newline at end of file

1 0

bpo-39439: Fix multiprocessing spawn path in a venv on Windows (GH-18158)
by Steve Dower Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/0be3246d4f9c8eddcd55491901d95b09fe… commit: 0be3246d4f9c8eddcd55491901d95b09fe163f15 branch: master author: Adam Meily <ameily(a)users.noreply.github.com> committer: Steve Dower <steve.dower(a)python.org> date: 2020-01-28T21:34:23+11:00 summary: bpo-39439: Fix multiprocessing spawn path in a venv on Windows (GH-18158) files: A Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst M Lib/multiprocessing/spawn.py diff --git a/Lib/multiprocessing/spawn.py b/Lib/multiprocessing/spawn.py index 075f3455478b5..7cc129e261076 100644 --- a/Lib/multiprocessing/spawn.py +++ b/Lib/multiprocessing/spawn.py @@ -36,7 +36,7 @@ if WINSERVICE: _python_exe = os.path.join(sys.exec_prefix, 'python.exe') else: - _python_exe = sys._base_executable + _python_exe = sys.executable def set_executable(exe): global _python_exe diff --git a/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst b/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst new file mode 100644 index 0000000000000..d677c4c3e02d5 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-24-03-15-05.bpo-39439.sFxGfR.rst @@ -0,0 +1 @@ +Honor the Python path when a virtualenv is active on Windows. \ No newline at end of file

1 0

bpo-38092: Reduce overhead when using multiprocessing in a Windows virtual environment (GH-16098)
by Steve Dower Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/6990d1b6131873c7f0913908162e4c723d… commit: 6990d1b6131873c7f0913908162e4c723d00ea19 branch: 3.7 author: Adam Meily <ameily(a)users.noreply.github.com> committer: Steve Dower <steve.dower(a)python.org> date: 2020-01-28T21:29:16+11:00 summary: bpo-38092: Reduce overhead when using multiprocessing in a Windows virtual environment (GH-16098) files: A Misc/NEWS.d/next/Windows/2020-01-24-03-07-14.bpo-39439.rwMWDR.rst M Lib/multiprocessing/popen_spawn_win32.py diff --git a/Lib/multiprocessing/popen_spawn_win32.py b/Lib/multiprocessing/popen_spawn_win32.py index e01953d32b7a4..d9442094909bd 100644 --- a/Lib/multiprocessing/popen_spawn_win32.py +++ b/Lib/multiprocessing/popen_spawn_win32.py @@ -69,7 +69,7 @@ def __init__(self, process_obj): try: hp, ht, pid, tid = _winapi.CreateProcess( python_exe, cmd, - env, None, False, 0, None, None, None) + None, None, False, 0, env, None, None) _winapi.CloseHandle(ht) except: _winapi.CloseHandle(rhandle) diff --git a/Misc/NEWS.d/next/Windows/2020-01-24-03-07-14.bpo-39439.rwMWDR.rst b/Misc/NEWS.d/next/Windows/2020-01-24-03-07-14.bpo-39439.rwMWDR.rst new file mode 100644 index 0000000000000..d64e63757728a --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-24-03-07-14.bpo-39439.rwMWDR.rst @@ -0,0 +1 @@ +Reduce overhead when using multiprocessing in a Windows virtual environment \ No newline at end of file

1 0

bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935)
by Miss Islington (bot) Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/cee5da861091cdaca99f0636af7ab8c4b0… commit: cee5da861091cdaca99f0636af7ab8c4b0274e5f branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T02:18:09-08:00 summary: bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935) Co-Authored-By: Kyle Stanley <aeros167(a)gmail.com> (cherry picked from commit 148610d88a2785751ed435a4e60f07a9f1bc50a6) Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> files: M Doc/using/cmdline.rst M Doc/using/windows.rst diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index c30f6fc7cfd87..53206c7b54649 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -936,8 +936,6 @@ conflict. Also available as the :option:`-X` ``utf8`` option. - .. availability:: \*nix. - .. versionadded:: 3.7 See :pep:`540` for more details. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 9dc3e796cc211..636f48dfb012b 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -602,6 +602,50 @@ existed):: C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.8 +.. _win-utf8-mode: + +UTF-8 mode +========== + +.. versionadded:: 3.7 + +Windows still uses legacy encodings for the system encoding (the ANSI Code +Page). Python uses it for the default encoding of text files (e.g. +:func:`locale.getpreferredencoding`). + +This may cause issues because UTF-8 is widely used on the internet +and most Unix systems, including WSL (Windows Subsystem for Linux). + +You can use UTF-8 mode to change the default text encoding to UTF-8. +You can enable UTF-8 mode via the ``-X utf8`` command line option, or +the ``PYTHONUTF8=1`` environment variable. See :envvar:`PYTHONUTF8` for +enabling UTF-8 mode, and :ref:`setting-envvars` for how to modify +environment variables. + +When UTF-8 mode is enabled: + +* :func:`locale.getpreferredencoding` returns ``'UTF-8'`` instead of + the system encoding. This function is used for the default text + encoding in many places, including :func:`open`, :class:`Popen`, + :meth:`Path.read_text`, etc. +* :data:`sys.stdin`, :data:`sys.stdout`, and :data:`sys.stderr` + all use UTF-8 as their text encoding. +* You can still use the system encoding via the "mbcs" codec. + +Note that adding ``PYTHONUTF8=1`` to the default environment variables +will affect all Python 3.7+ applications on your system. +If you have any Python 3.7+ applications which rely on the legacy +system encoding, it is recommended to set the environment variable +temporarily or use the ``-X utf8`` command line option. + +.. note:: + Even when UTF-8 mode is disabled, Python uses UTF-8 by default + on Windows for: + + * Console I/O including standard I/O (see :pep:`528` for details). + * The filesystem encoding (see :pep:`529` for details). + + .. _launcher: Python Launcher for Windows

1 0

bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935)
by Miss Islington (bot) Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/5a49ccac443ae84b8e142473a659c73032… commit: 5a49ccac443ae84b8e142473a659c73032e9fe53 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T02:17:20-08:00 summary: bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935) Co-Authored-By: Kyle Stanley <aeros167(a)gmail.com> (cherry picked from commit 148610d88a2785751ed435a4e60f07a9f1bc50a6) Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> files: M Doc/using/cmdline.rst M Doc/using/windows.rst diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 2c34ac29b68f2..6a1d7aa00d082 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -908,8 +908,6 @@ conflict. Also available as the :option:`-X` ``utf8`` option. - .. availability:: \*nix. - .. versionadded:: 3.7 See :pep:`540` for more details. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index bcc618ca143b3..f5dddb5a37af8 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -605,6 +605,50 @@ existed):: C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.7 +.. _win-utf8-mode: + +UTF-8 mode +========== + +.. versionadded:: 3.7 + +Windows still uses legacy encodings for the system encoding (the ANSI Code +Page). Python uses it for the default encoding of text files (e.g. +:func:`locale.getpreferredencoding`). + +This may cause issues because UTF-8 is widely used on the internet +and most Unix systems, including WSL (Windows Subsystem for Linux). + +You can use UTF-8 mode to change the default text encoding to UTF-8. +You can enable UTF-8 mode via the ``-X utf8`` command line option, or +the ``PYTHONUTF8=1`` environment variable. See :envvar:`PYTHONUTF8` for +enabling UTF-8 mode, and :ref:`setting-envvars` for how to modify +environment variables. + +When UTF-8 mode is enabled: + +* :func:`locale.getpreferredencoding` returns ``'UTF-8'`` instead of + the system encoding. This function is used for the default text + encoding in many places, including :func:`open`, :class:`Popen`, + :meth:`Path.read_text`, etc. +* :data:`sys.stdin`, :data:`sys.stdout`, and :data:`sys.stderr` + all use UTF-8 as their text encoding. +* You can still use the system encoding via the "mbcs" codec. + +Note that adding ``PYTHONUTF8=1`` to the default environment variables +will affect all Python 3.7+ applications on your system. +If you have any Python 3.7+ applications which rely on the legacy +system encoding, it is recommended to set the environment variable +temporarily or use the ``-X utf8`` command line option. + +.. note:: + Even when UTF-8 mode is disabled, Python uses UTF-8 by default + on Windows for: + + * Console I/O including standard I/O (see :pep:`528` for details). + * The filesystem encoding (see :pep:`529` for details). + + .. _launcher: Python Launcher for Windows

1 0

bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935)
by Inada Naoki Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/148610d88a2785751ed435a4e60f07a9f1… commit: 148610d88a2785751ed435a4e60f07a9f1bc50a6 branch: master author: Inada Naoki <songofacandy(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T19:12:31+09:00 summary: bpo-39287: Doc: Add UTF-8 mode section in using/windows. (GH-17935) Co-Authored-By: Kyle Stanley <aeros167(a)gmail.com> files: M Doc/using/cmdline.rst M Doc/using/windows.rst diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 146003b147131..fb88673d30b1b 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -929,8 +929,6 @@ conflict. Also available as the :option:`-X` ``utf8`` option. - .. availability:: \*nix. - .. versionadded:: 3.7 See :pep:`540` for more details. diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 4912048a1ab55..97e9cdfeb0939 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -602,6 +602,50 @@ existed):: C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Python 3.9 +.. _win-utf8-mode: + +UTF-8 mode +========== + +.. versionadded:: 3.7 + +Windows still uses legacy encodings for the system encoding (the ANSI Code +Page). Python uses it for the default encoding of text files (e.g. +:func:`locale.getpreferredencoding`). + +This may cause issues because UTF-8 is widely used on the internet +and most Unix systems, including WSL (Windows Subsystem for Linux). + +You can use UTF-8 mode to change the default text encoding to UTF-8. +You can enable UTF-8 mode via the ``-X utf8`` command line option, or +the ``PYTHONUTF8=1`` environment variable. See :envvar:`PYTHONUTF8` for +enabling UTF-8 mode, and :ref:`setting-envvars` for how to modify +environment variables. + +When UTF-8 mode is enabled: + +* :func:`locale.getpreferredencoding` returns ``'UTF-8'`` instead of + the system encoding. This function is used for the default text + encoding in many places, including :func:`open`, :class:`Popen`, + :meth:`Path.read_text`, etc. +* :data:`sys.stdin`, :data:`sys.stdout`, and :data:`sys.stderr` + all use UTF-8 as their text encoding. +* You can still use the system encoding via the "mbcs" codec. + +Note that adding ``PYTHONUTF8=1`` to the default environment variables +will affect all Python 3.7+ applications on your system. +If you have any Python 3.7+ applications which rely on the legacy +system encoding, it is recommended to set the environment variable +temporarily or use the ``-X utf8`` command line option. + +.. note:: + Even when UTF-8 mode is disabled, Python uses UTF-8 by default + on Windows for: + + * Console I/O including standard I/O (see :pep:`528` for details). + * The filesystem encoding (see :pep:`529` for details). + + .. _launcher: Python Launcher for Windows

1 0

bpo-39393: Misleading error message on dependent DLL resolution failure (GH-18093)
by Miss Islington (bot) Jan. 28, 2020

Jan. 28, 2020

https://github.com/python/cpython/commit/46735c7e101753769e31c69a36d0030bb0… commit: 46735c7e101753769e31c69a36d0030bb056a162 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-01-28T02:00:16-08:00 summary: bpo-39393: Misleading error message on dependent DLL resolution failure (GH-18093) (cherry picked from commit 13c1c3556f2c12d0be2af890fabfbf44280b845c) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: A Misc/NEWS.d/next/Windows/2020-01-20-23-42-53.bpo-39393.gWlJDG.rst M Modules/_ctypes/callproc.c diff --git a/Misc/NEWS.d/next/Windows/2020-01-20-23-42-53.bpo-39393.gWlJDG.rst b/Misc/NEWS.d/next/Windows/2020-01-20-23-42-53.bpo-39393.gWlJDG.rst new file mode 100644 index 0000000000000..025b7e96a6e74 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-20-23-42-53.bpo-39393.gWlJDG.rst @@ -0,0 +1,2 @@ +Improve the error message when attempting to load a DLL with unresolved +dependencies. diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 77492e650ea48..4027bdb622750 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1311,8 +1311,9 @@ static PyObject *load_library(PyObject *self, PyObject *args) if (err == ERROR_MOD_NOT_FOUND) { PyErr_Format(PyExc_FileNotFoundError, - ("Could not find module '%.500S'. Try using " - "the full path with constructor syntax."), + ("Could not find module '%.500S' (or one of its " + "dependencies). Try using the full path with " + "constructor syntax."), nameobj); return NULL; } else if (err) {

1 0