Mailman 3 January 2019 - Python-checkins

bpo-35854: Fix EnvBuilder and --symlinks in venv on Windows (GH-11700)
by Miss Islington (bot) 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/03082a836b707528f885080bda9732d898… commit: 03082a836b707528f885080bda9732d89849d4e3 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-30T14:14:35-08:00 summary: bpo-35854: Fix EnvBuilder and --symlinks in venv on Windows (GH-11700) (cherry picked from commit a1f9a3332bd4767e47013ea787022f06b6dbcbbd) Co-authored-by: Steve Dower <steve.dower(a)microsoft.com> files: A Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst M Doc/library/venv.rst M Doc/using/venv-create.inc M Lib/test/test_venv.py M Lib/venv/__init__.py diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst index 53f3d2640566..fefc522b45d1 100644 --- a/Doc/library/venv.rst +++ b/Doc/library/venv.rst @@ -114,8 +114,7 @@ creation according to their needs, the :class:`EnvBuilder` class. any existing target directory, before creating the environment. * ``symlinks`` -- a Boolean value indicating whether to attempt to symlink the - Python binary (and any necessary DLLs or other binaries, - e.g. ``pythonw.exe``), rather than copying. + Python binary rather than copying. * ``upgrade`` -- a Boolean value which, if true, will upgrade an existing environment with the running Python - for use when that Python has been @@ -181,15 +180,15 @@ creation according to their needs, the :class:`EnvBuilder` class. .. method:: setup_python(context) - Creates a copy of the Python executable in the environment on POSIX - systems. If a specific executable ``python3.x`` was used, symlinks to - ``python`` and ``python3`` will be created pointing to that executable, - unless files with those names already exist. + Creates a copy or symlink to the Python executable in the environment. + On POSIX systems, if a specific executable ``python3.x`` was used, + symlinks to ``python`` and ``python3`` will be created pointing to that + executable, unless files with those names already exist. .. method:: setup_scripts(context) Installs activation scripts appropriate to the platform into the virtual - environment. On Windows, also installs the ``python[w].exe`` scripts. + environment. .. method:: post_setup(context) @@ -199,8 +198,13 @@ creation according to their needs, the :class:`EnvBuilder` class. .. versionchanged:: 3.7.2 Windows now uses redirector scripts for ``python[w].exe`` instead of - copying the actual binaries, and so :meth:`setup_python` does nothing - unless running from a build in the source tree. + copying the actual binaries. In 3.7.2 only :meth:`setup_python` does + nothing unless running from a build in the source tree. + + .. versionchanged:: 3.7.3 + Windows copies the redirector scripts as part of :meth:`setup_python` + instead of :meth:`setup_scripts`. This was not the case in 3.7.2. + When using symlinks, the original executables will be linked. In addition, :class:`EnvBuilder` provides this utility method that can be called from :meth:`setup_scripts` or :meth:`post_setup` in subclasses to diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index ba5096abd370..1ba538bec48b 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -70,6 +70,11 @@ The command, if run with ``-h``, will show the available options:: In earlier versions, if the target directory already existed, an error was raised, unless the ``--clear`` or ``--upgrade`` option was provided. +.. note:: + While symlinks are supported on Windows, they are not recommended. Of + particular note is that double-clicking ``python.exe`` in File Explorer + will resolve the symlink eagerly and ignore the virtual environment. + The created ``pyvenv.cfg`` file also includes the ``include-system-site-packages`` key, set to ``true`` if ``venv`` is run with the ``--system-site-packages`` option, ``false`` otherwise. diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index 34c2234493bc..6096b9df45bf 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -243,7 +243,6 @@ def test_isolation(self): self.assertIn('include-system-site-packages = %s\n' % s, data) @unittest.skipUnless(can_symlink(), 'Needs symlinks') - @unittest.skipIf(os.name == 'nt', 'Symlinks are never used on Windows') def test_symlinking(self): """ Test symlinking works as expected diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 5438b0d4e508..8f9e3138474a 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -64,11 +64,10 @@ def create(self, env_dir): self.system_site_packages = False self.create_configuration(context) self.setup_python(context) - if not self.upgrade: - self.setup_scripts(context) if self.with_pip: self._setup_pip(context) if not self.upgrade: + self.setup_scripts(context) self.post_setup(context) if true_system_site_packages: # We had set it to False before, now @@ -176,6 +175,23 @@ def symlink_or_copy(self, src, dst, relative_symlinks_ok=False): logger.warning('Unable to symlink %r to %r', src, dst) force_copy = True if force_copy: + if os.name == 'nt': + # On Windows, we rewrite symlinks to our base python.exe into + # copies of venvlauncher.exe + basename, ext = os.path.splitext(os.path.basename(src)) + if basename.endswith('_d'): + ext = '_d' + ext + basename = basename[:-2] + if sysconfig.is_python_build(True): + if basename == 'python': + basename = 'venvlauncher' + elif basename == 'pythonw': + basename = 'venvwlauncher' + scripts = os.path.dirname(src) + else: + scripts = os.path.join(os.path.dirname(__file__), "scripts", "nt") + src = os.path.join(scripts, basename + ext) + shutil.copyfile(src, dst) def setup_python(self, context): @@ -202,23 +218,31 @@ def setup_python(self, context): if not os.path.islink(path): os.chmod(path, 0o755) else: - # For normal cases, the venvlauncher will be copied from - # our scripts folder. For builds, we need to copy it - # manually. - if sysconfig.is_python_build(True): - suffix = '.exe' - if context.python_exe.lower().endswith('_d.exe'): - suffix = '_d.exe' - - src = os.path.join(dirname, "venvlauncher" + suffix) - dst = os.path.join(binpath, context.python_exe) - copier(src, dst) + if self.symlinks: + # For symlinking, we need a complete copy of the root directory + # If symlinks fail, you'll get unnecessary copies of files, but + # we assume that if you've opted into symlinks on Windows then + # you know what you're doing. + suffixes = [ + f for f in os.listdir(dirname) if + os.path.normcase(os.path.splitext(f)[1]) in ('.exe', '.dll') + ] + if sysconfig.is_python_build(True): + suffixes = [ + f for f in suffixes if + os.path.normcase(f).startswith(('python', 'vcruntime')) + ] + else: + suffixes = ['python.exe', 'python_d.exe', 'pythonw.exe', + 'pythonw_d.exe'] - src = os.path.join(dirname, "venvwlauncher" + suffix) - dst = os.path.join(binpath, "pythonw" + suffix) - copier(src, dst) + for suffix in suffixes: + src = os.path.join(dirname, suffix) + if os.path.exists(src): + copier(src, os.path.join(binpath, suffix)) - # copy init.tcl over + if sysconfig.is_python_build(True): + # copy init.tcl for root, dirs, files in os.walk(context.python_dir): if 'init.tcl' in files: tcldir = os.path.basename(root) @@ -304,6 +328,9 @@ def install_scripts(self, context, path): dirs.remove(d) continue # ignore files in top level for f in files: + if (os.name == 'nt' and f.startswith('python') + and f.endswith(('.exe', '.pdb'))): + continue srcfile = os.path.join(root, f) suffix = root[plen:].split(os.sep)[2:] if not suffix: diff --git a/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst b/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst new file mode 100644 index 000000000000..a1c761458d35 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst @@ -0,0 +1 @@ +Fix EnvBuilder and --symlinks in venv on Windows

1 0

Document differences between random.choices() and random.choice(). (GH-11703) (GH-11706)
by Raymond Hettinger 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/e31f8604e692c46800abd70f88d9928fa1… commit: e31f8604e692c46800abd70f88d9928fa1f17b7c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2019-01-30T13:49:23-08:00 summary: Document differences between random.choices() and random.choice(). (GH-11703) (GH-11706) files: M Doc/library/random.rst diff --git a/Doc/library/random.rst b/Doc/library/random.rst index 4f251574a327..a543ff016a62 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -162,6 +162,13 @@ Functions for sequences with the :class:`float` values returned by :func:`random` (that includes integers, floats, and fractions but excludes decimals). + For a given seed, the :func:`choices` function with equal weighting + typically produces a different sequence than repeated calls to + :func:`choice`. The algorithm used by :func:`choices` uses floating + point arithmetic for internal consistency and speed. The algorithm used + by :func:`choice` defaults to integer arithmetic with repeated selections + to avoid small biases from round-off error. + .. versionadded:: 3.6

1 0

bpo-35854: Fix EnvBuilder and --symlinks in venv on Windows (GH-11700)
by Steve Dower 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/a1f9a3332bd4767e47013ea787022f06b6… commit: a1f9a3332bd4767e47013ea787022f06b6dbcbbd branch: master author: Steve Dower <steve.dower(a)microsoft.com> committer: GitHub <noreply(a)github.com> date: 2019-01-30T13:49:14-08:00 summary: bpo-35854: Fix EnvBuilder and --symlinks in venv on Windows (GH-11700) files: A Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst M Doc/library/venv.rst M Doc/using/venv-create.inc M Lib/test/test_venv.py M Lib/venv/__init__.py diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst index efa51e231c82..412808ad4486 100644 --- a/Doc/library/venv.rst +++ b/Doc/library/venv.rst @@ -109,8 +109,7 @@ creation according to their needs, the :class:`EnvBuilder` class. any existing target directory, before creating the environment. * ``symlinks`` -- a Boolean value indicating whether to attempt to symlink the - Python binary (and any necessary DLLs or other binaries, - e.g. ``pythonw.exe``), rather than copying. + Python binary rather than copying. * ``upgrade`` -- a Boolean value which, if true, will upgrade an existing environment with the running Python - for use when that Python has been @@ -176,15 +175,15 @@ creation according to their needs, the :class:`EnvBuilder` class. .. method:: setup_python(context) - Creates a copy of the Python executable in the environment on POSIX - systems. If a specific executable ``python3.x`` was used, symlinks to - ``python`` and ``python3`` will be created pointing to that executable, - unless files with those names already exist. + Creates a copy or symlink to the Python executable in the environment. + On POSIX systems, if a specific executable ``python3.x`` was used, + symlinks to ``python`` and ``python3`` will be created pointing to that + executable, unless files with those names already exist. .. method:: setup_scripts(context) Installs activation scripts appropriate to the platform into the virtual - environment. On Windows, also installs the ``python[w].exe`` scripts. + environment. .. method:: post_setup(context) @@ -194,8 +193,13 @@ creation according to their needs, the :class:`EnvBuilder` class. .. versionchanged:: 3.7.2 Windows now uses redirector scripts for ``python[w].exe`` instead of - copying the actual binaries, and so :meth:`setup_python` does nothing - unless running from a build in the source tree. + copying the actual binaries. In 3.7.2 only :meth:`setup_python` does + nothing unless running from a build in the source tree. + + .. versionchanged:: 3.7.3 + Windows copies the redirector scripts as part of :meth:`setup_python` + instead of :meth:`setup_scripts`. This was not the case in 3.7.2. + When using symlinks, the original executables will be linked. In addition, :class:`EnvBuilder` provides this utility method that can be called from :meth:`setup_scripts` or :meth:`post_setup` in subclasses to diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc index ba5096abd370..1ba538bec48b 100644 --- a/Doc/using/venv-create.inc +++ b/Doc/using/venv-create.inc @@ -70,6 +70,11 @@ The command, if run with ``-h``, will show the available options:: In earlier versions, if the target directory already existed, an error was raised, unless the ``--clear`` or ``--upgrade`` option was provided. +.. note:: + While symlinks are supported on Windows, they are not recommended. Of + particular note is that double-clicking ``python.exe`` in File Explorer + will resolve the symlink eagerly and ignore the virtual environment. + The created ``pyvenv.cfg`` file also includes the ``include-system-site-packages`` key, set to ``true`` if ``venv`` is run with the ``--system-site-packages`` option, ``false`` otherwise. diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index 34c2234493bc..6096b9df45bf 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -243,7 +243,6 @@ def test_isolation(self): self.assertIn('include-system-site-packages = %s\n' % s, data) @unittest.skipUnless(can_symlink(), 'Needs symlinks') - @unittest.skipIf(os.name == 'nt', 'Symlinks are never used on Windows') def test_symlinking(self): """ Test symlinking works as expected diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py index 5438b0d4e508..8f9e3138474a 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -64,11 +64,10 @@ def create(self, env_dir): self.system_site_packages = False self.create_configuration(context) self.setup_python(context) - if not self.upgrade: - self.setup_scripts(context) if self.with_pip: self._setup_pip(context) if not self.upgrade: + self.setup_scripts(context) self.post_setup(context) if true_system_site_packages: # We had set it to False before, now @@ -176,6 +175,23 @@ def symlink_or_copy(self, src, dst, relative_symlinks_ok=False): logger.warning('Unable to symlink %r to %r', src, dst) force_copy = True if force_copy: + if os.name == 'nt': + # On Windows, we rewrite symlinks to our base python.exe into + # copies of venvlauncher.exe + basename, ext = os.path.splitext(os.path.basename(src)) + if basename.endswith('_d'): + ext = '_d' + ext + basename = basename[:-2] + if sysconfig.is_python_build(True): + if basename == 'python': + basename = 'venvlauncher' + elif basename == 'pythonw': + basename = 'venvwlauncher' + scripts = os.path.dirname(src) + else: + scripts = os.path.join(os.path.dirname(__file__), "scripts", "nt") + src = os.path.join(scripts, basename + ext) + shutil.copyfile(src, dst) def setup_python(self, context): @@ -202,23 +218,31 @@ def setup_python(self, context): if not os.path.islink(path): os.chmod(path, 0o755) else: - # For normal cases, the venvlauncher will be copied from - # our scripts folder. For builds, we need to copy it - # manually. - if sysconfig.is_python_build(True): - suffix = '.exe' - if context.python_exe.lower().endswith('_d.exe'): - suffix = '_d.exe' - - src = os.path.join(dirname, "venvlauncher" + suffix) - dst = os.path.join(binpath, context.python_exe) - copier(src, dst) + if self.symlinks: + # For symlinking, we need a complete copy of the root directory + # If symlinks fail, you'll get unnecessary copies of files, but + # we assume that if you've opted into symlinks on Windows then + # you know what you're doing. + suffixes = [ + f for f in os.listdir(dirname) if + os.path.normcase(os.path.splitext(f)[1]) in ('.exe', '.dll') + ] + if sysconfig.is_python_build(True): + suffixes = [ + f for f in suffixes if + os.path.normcase(f).startswith(('python', 'vcruntime')) + ] + else: + suffixes = ['python.exe', 'python_d.exe', 'pythonw.exe', + 'pythonw_d.exe'] - src = os.path.join(dirname, "venvwlauncher" + suffix) - dst = os.path.join(binpath, "pythonw" + suffix) - copier(src, dst) + for suffix in suffixes: + src = os.path.join(dirname, suffix) + if os.path.exists(src): + copier(src, os.path.join(binpath, suffix)) - # copy init.tcl over + if sysconfig.is_python_build(True): + # copy init.tcl for root, dirs, files in os.walk(context.python_dir): if 'init.tcl' in files: tcldir = os.path.basename(root) @@ -304,6 +328,9 @@ def install_scripts(self, context, path): dirs.remove(d) continue # ignore files in top level for f in files: + if (os.name == 'nt' and f.startswith('python') + and f.endswith(('.exe', '.pdb'))): + continue srcfile = os.path.join(root, f) suffix = root[plen:].split(os.sep)[2:] if not suffix: diff --git a/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst b/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst new file mode 100644 index 000000000000..a1c761458d35 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-01-29-15-44-46.bpo-35854.Ww3z19.rst @@ -0,0 +1 @@ +Fix EnvBuilder and --symlinks in venv on Windows

1 0

Document differences between random.choices() and random.choice(). (GH-11703)
by Raymond Hettinger 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/40ebe948e97b47fc84c8f527910063286a… commit: 40ebe948e97b47fc84c8f527910063286a174b25 branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-30T13:30:20-08:00 summary: Document differences between random.choices() and random.choice(). (GH-11703) files: M Doc/library/random.rst diff --git a/Doc/library/random.rst b/Doc/library/random.rst index 4f251574a327..a543ff016a62 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -162,6 +162,13 @@ Functions for sequences with the :class:`float` values returned by :func:`random` (that includes integers, floats, and fractions but excludes decimals). + For a given seed, the :func:`choices` function with equal weighting + typically produces a different sequence than repeated calls to + :func:`choice`. The algorithm used by :func:`choices` uses floating + point arithmetic for internal consistency and speed. The algorithm used + by :func:`choice` defaults to integer arithmetic with repeated selections + to avoid small biases from round-off error. + .. versionadded:: 3.6

1 0

bpo-35835: Add reference to Python 3.7 new breakpoint() function in pdb documentation. (GH-11691)
by Miss Islington (bot) 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/7516f265a8517e4fdc7d6e63d72ae1b57f… commit: 7516f265a8517e4fdc7d6e63d72ae1b57fda26ee branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-30T09:41:51-08:00 summary: bpo-35835: Add reference to Python 3.7 new breakpoint() function in pdb documentation. (GH-11691) (cherry picked from commit cf991e653ac550a9f011631447c61ce583404a57) Co-authored-by: João Matos <jcrmatos(a)gmail.com> files: M Doc/library/pdb.rst diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst index a72876f3f5a8..c7864e9e3f22 100644 --- a/Doc/library/pdb.rst +++ b/Doc/library/pdb.rst @@ -76,6 +76,10 @@ at the location you want to break into the debugger. You can then step through the code following this statement, and continue running without the debugger using the :pdbcmd:`continue` command. +.. versionadded:: 3.7 + The built-in :func:`breakpoint()`, when called with defaults, can be used + instead of ``import pdb; pdb.set_trace()``. + The typical usage to inspect a crashed program is:: >>> import pdb

1 0

bpo-35717: Fix KeyError exception raised when using enums and compile (GH-11523) (GH-11669)
by Victor Stinner 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/1c79891026c57046f5ac596080ea60c515… commit: 1c79891026c57046f5ac596080ea60c515e0560a branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2019-01-30T18:36:51+01:00 summary: bpo-35717: Fix KeyError exception raised when using enums and compile (GH-11523) (GH-11669) https://bugs.python.org/issue17467 (cherry picked from commit 1fd06f1eca80dcbf3a916133919482a8327f3da4) Co-authored-by: Rémi Lapeyre <remi.lapeyre(a)henki.fr> files: A Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst M Lib/enum.py M Lib/test/test_enum.py M Misc/ACKS diff --git a/Lib/enum.py b/Lib/enum.py index 782d37433a6e..8984cac60955 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -427,7 +427,7 @@ def _create_(cls, class_name, names, *, module=None, qualname=None, type=None, s if module is None: try: module = sys._getframe(2).f_globals['__name__'] - except (AttributeError, ValueError) as exc: + except (AttributeError, ValueError, KeyError) as exc: pass if module is None: _make_class_unpicklable(enum_class) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index b221045328db..fdc3dd9c38a0 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1866,6 +1866,15 @@ class Decision2(MyEnum): REVERT_ALL = "REVERT_ALL" RETRY = "RETRY" + def test_empty_globals(self): + # bpo-35717: sys._getframe(2).f_globals['__name__'] fails with KeyError + # when using compile and exec because f_globals is empty + code = "from enum import Enum; Enum('Animal', 'ANT BEE CAT DOG')" + code = compile(code, "<string>", "exec") + global_ns = {} + local_ls = {} + exec(code, global_ns, local_ls) + class TestOrder(unittest.TestCase): diff --git a/Misc/ACKS b/Misc/ACKS index 027e01307225..193592290f0e 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -895,6 +895,7 @@ Glenn Langford Andrew Langmead Wolfgang Langner Detlef Lannert +Rémi Lapeyre Soren Larsen Amos Latteier Piers Lauder diff --git a/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst b/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst new file mode 100644 index 000000000000..7cae1d1c82c7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst @@ -0,0 +1,2 @@ +Fix KeyError exception raised when using enums and compile. Patch +contributed by Rémi Lapeyre.

1 0

bpo-35835: Add reference to Python 3.7 new breakpoint() function in pdb documentation. (GH-11691)
by Miss Islington (bot) 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/cf991e653ac550a9f011631447c61ce583… commit: cf991e653ac550a9f011631447c61ce583404a57 branch: master author: João Matos <jcrmatos(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-01-30T09:23:39-08:00 summary: bpo-35835: Add reference to Python 3.7 new breakpoint() function in pdb documentation. (GH-11691) files: M Doc/library/pdb.rst diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst index a72876f3f5a8..c7864e9e3f22 100644 --- a/Doc/library/pdb.rst +++ b/Doc/library/pdb.rst @@ -76,6 +76,10 @@ at the location you want to break into the debugger. You can then step through the code following this statement, and continue running without the debugger using the :pdbcmd:`continue` command. +.. versionadded:: 3.7 + The built-in :func:`breakpoint()`, when called with defaults, can be used + instead of ``import pdb; pdb.set_trace()``. + The typical usage to inspect a crashed program is:: >>> import pdb

1 0

bpo-25592: Improve documentation of distutils data_files (GH-9767) (GH-11701)
by Antoine Pitrou 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/ebae1ce9c40e62ce52dc968f86ed11578d… commit: ebae1ce9c40e62ce52dc968f86ed11578d2fcdfd branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2019-01-30T16:56:51+01:00 summary: bpo-25592: Improve documentation of distutils data_files (GH-9767) (GH-11701) (cherry picked from commit 598e15d4feaee3849a91d92c9ca51f17baafe19c) Co-authored-by: jdemeyer <J.Demeyer(a)UGent.be> files: M Doc/distutils/setupscript.rst diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index c1051d2e807e..54ed1aebc242 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -524,20 +524,23 @@ following way:: setup(..., data_files=[('bitmaps', ['bm/b1.gif', 'bm/b2.gif']), ('config', ['cfg/data.cfg']), - ('/etc/init.d', ['init-script'])] ) -Note that you can specify the directory names where the data files will be -installed, but you cannot rename the data files themselves. - Each (*directory*, *files*) pair in the sequence specifies the installation -directory and the files to install there. If *directory* is a relative path, it -is interpreted relative to the installation prefix (Python's ``sys.prefix`` for -pure-Python packages, ``sys.exec_prefix`` for packages that contain extension -modules). Each file name in *files* is interpreted relative to the -:file:`setup.py` script at the top of the package source distribution. No -directory information from *files* is used to determine the final location of -the installed file; only the name of the file is used. +directory and the files to install there. + +Each file name in *files* is interpreted relative to the :file:`setup.py` +script at the top of the package source distribution. Note that you can +specify the directory where the data files will be installed, but you cannot +rename the data files themselves. + +The *directory* should be a relative path. It is interpreted relative to the +installation prefix (Python's ``sys.prefix`` for system installations; +``site.USER_BASE`` for user installations). Distutils allows *directory* to be +an absolute installation path, but this is discouraged since it is +incompatible with the wheel packaging format. No directory information from +*files* is used to determine the final location of the installed file; only +the name of the file is used. You can specify the ``data_files`` options as a simple sequence of files without specifying a target directory, but this is not recommended, and the

1 0

bpo-25592: Improve documentation of distutils data_files (GH-9767)
by Antoine Pitrou 30 Jan '19

30 Jan '19

https://github.com/python/cpython/commit/598e15d4feaee3849a91d92c9ca51f17ba… commit: 598e15d4feaee3849a91d92c9ca51f17baafe19c branch: master author: jdemeyer <J.Demeyer(a)UGent.be> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2019-01-30T16:49:39+01:00 summary: bpo-25592: Improve documentation of distutils data_files (GH-9767) files: M Doc/distutils/setupscript.rst diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index c1051d2e807e..54ed1aebc242 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -524,20 +524,23 @@ following way:: setup(..., data_files=[('bitmaps', ['bm/b1.gif', 'bm/b2.gif']), ('config', ['cfg/data.cfg']), - ('/etc/init.d', ['init-script'])] ) -Note that you can specify the directory names where the data files will be -installed, but you cannot rename the data files themselves. - Each (*directory*, *files*) pair in the sequence specifies the installation -directory and the files to install there. If *directory* is a relative path, it -is interpreted relative to the installation prefix (Python's ``sys.prefix`` for -pure-Python packages, ``sys.exec_prefix`` for packages that contain extension -modules). Each file name in *files* is interpreted relative to the -:file:`setup.py` script at the top of the package source distribution. No -directory information from *files* is used to determine the final location of -the installed file; only the name of the file is used. +directory and the files to install there. + +Each file name in *files* is interpreted relative to the :file:`setup.py` +script at the top of the package source distribution. Note that you can +specify the directory where the data files will be installed, but you cannot +rename the data files themselves. + +The *directory* should be a relative path. It is interpreted relative to the +installation prefix (Python's ``sys.prefix`` for system installations; +``site.USER_BASE`` for user installations). Distutils allows *directory* to be +an absolute installation path, but this is discouraged since it is +incompatible with the wheel packaging format. No directory information from +*files* is used to determine the final location of the installed file; only +the name of the file is used. You can specify the ``data_files`` options as a simple sequence of files without specifying a target directory, but this is not recommended, and the

1 0

Daily reference leaks (4243df51fe43): sum=6
by solipsis＠pitrou.net 30 Jan '19

30 Jan '19

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

1 0