Mailman 3 November 2018 - Python-checkins

bpo-16086: Fix PyType_GetFlags() documentation (GH-10758) (GH-10789)
by Victor Stinner Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/e754159ef0af99a4124dd041ab7ceb77fc… commit: e754159ef0af99a4124dd041ab7ceb77fcc922ad branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-11-29T12:07:33+01:00 summary: bpo-16086: Fix PyType_GetFlags() documentation (GH-10758) (GH-10789) PyType_GetFlags() return type is unsigned long, not long. (cherry picked from commit 9fbcfc08e5814d7aa9287740187e461425a99f67) Co-authored-by: Eddie Elizondo <eduardo.elizondorueda(a)gmail.com> files: M Doc/c-api/type.rst diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst index 60c5e73960b3..4dfd53fb9f07 100644 --- a/Doc/c-api/type.rst +++ b/Doc/c-api/type.rst @@ -35,7 +35,7 @@ Type Objects Clear the internal lookup cache. Return the current version tag. -.. c:function:: long PyType_GetFlags(PyTypeObject* type) +.. c:function:: unsigned long PyType_GetFlags(PyTypeObject* type) Return the :c:member:`~PyTypeObject.tp_flags` member of *type*. This function is primarily meant for use with `Py_LIMITED_API`; the individual flag bits are @@ -44,6 +44,9 @@ Type Objects .. versionadded:: 3.2 + .. versionchanged:: 3.4 + The return type is now ``unsigned long`` rather than ``long``. + .. c:function:: void PyType_Modified(PyTypeObject *type)

1 0

bpo-30167: Remove __cached__ from __main__ when removing __file__ (GH-7415)
by INADA Naoki Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/82daa60defbd6497efdaa6c1132ecc8563… commit: 82daa60defbd6497efdaa6c1132ecc8563122ed5 branch: master author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-29T20:01:27+09:00 summary: bpo-30167: Remove __cached__ from __main__ when removing __file__ (GH-7415) files: A Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst M Python/pythonrun.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst b/Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst new file mode 100644 index 000000000000..41bdec899b75 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-06-05-15-49-02.bpo-30167.e956hA.rst @@ -0,0 +1,2 @@ +``PyRun_SimpleFileExFlags`` removes ``__cached__`` from module in addition +to ``__file__``. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 2d5dc88c5c76..9b6371d9c0da 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -434,8 +434,14 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit, Py_DECREF(v); ret = 0; done: - if (set_file_name && PyDict_DelItemString(d, "__file__")) - PyErr_Clear(); + if (set_file_name) { + if (PyDict_DelItemString(d, "__file__")) { + PyErr_Clear(); + } + if (PyDict_DelItemString(d, "__cached__")) { + PyErr_Clear(); + } + } Py_XDECREF(m); return ret; }

1 0

bpo-16086: Fix PyType_GetFlags() documentation (GH-10758)
by Victor Stinner Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/9fbcfc08e5814d7aa9287740187e461425… commit: 9fbcfc08e5814d7aa9287740187e461425a99f67 branch: master author: Eddie Elizondo <eduardo.elizondorueda(a)gmail.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-11-29T10:11:36+01:00 summary: bpo-16086: Fix PyType_GetFlags() documentation (GH-10758) PyType_GetFlags() return type is unsigned long, not long. files: M Doc/c-api/type.rst diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst index 60c5e73960b3..4dfd53fb9f07 100644 --- a/Doc/c-api/type.rst +++ b/Doc/c-api/type.rst @@ -35,7 +35,7 @@ Type Objects Clear the internal lookup cache. Return the current version tag. -.. c:function:: long PyType_GetFlags(PyTypeObject* type) +.. c:function:: unsigned long PyType_GetFlags(PyTypeObject* type) Return the :c:member:`~PyTypeObject.tp_flags` member of *type*. This function is primarily meant for use with `Py_LIMITED_API`; the individual flag bits are @@ -44,6 +44,9 @@ Type Objects .. versionadded:: 3.2 + .. versionchanged:: 3.4 + The return type is now ``unsigned long`` rather than ``long``. + .. c:function:: void PyType_Modified(PyTypeObject *type)

1 0

Daily reference leaks (4243df51fe43): sum=7
by solipsis＠pitrou.net Nov. 29, 2018

Nov. 29, 2018

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

1 0

bpo-35345: Remove platform.popen() (GH-10781)
by Victor Stinner Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/73104fa1e6a791f7d66c0091ed91f6c396… commit: 73104fa1e6a791f7d66c0091ed91f6c396ca0fb2 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-11-29T09:58:20+01:00 summary: bpo-35345: Remove platform.popen() (GH-10781) Remove platform.popen() function, it was deprecated since Python 3.3: use os.popen() instead. Rename also the "Removed" section to "API and Feature Removals" of What's New in Python 3.8. files: A Misc/NEWS.d/next/Library/2018-11-29-00-55-33.bpo-35345.vepCSJ.rst M Doc/library/platform.rst M Doc/whatsnew/3.8.rst M Lib/platform.py M Lib/test/test_platform.py diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index 92691fcbeab4..7ac4b027418e 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -212,20 +212,6 @@ Windows Platform only runs on Win32 compatible platforms. -Win95/98 specific -^^^^^^^^^^^^^^^^^ - -.. function:: popen(cmd, mode='r', bufsize=-1) - - Portable :func:`popen` interface. Find a working popen implementation - preferring :func:`win32pipe.popen`. On Windows NT, :func:`win32pipe.popen` - should work; on Windows 9x it hangs due to bugs in the MS C library. - - .. deprecated:: 3.3 - This function is obsolete. Use the :mod:`subprocess` module. Check - especially the :ref:`subprocess-replacements` section. - - Mac OS Platform --------------- diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index e5e6d4a59944..5492a90aacec 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -373,8 +373,13 @@ Deprecated (Contributed by Serhiy Storchaka in :issue:`33710`.) -Removed -======= +API and Feature Removals +======================== + +The following features and APIs have been removed from Python 3.8: + +* The function :func:`platform.popen` has been removed, it was deprecated since + Python 3.3: use :func:`os.popen` instead. * The ``pyvenv`` script has been removed in favor of ``python3.8 -m venv`` to help eliminate confusion as to what Python interpreter the ``pyvenv`` @@ -414,6 +419,9 @@ Changes in Python behavior Changes in the Python API ------------------------- +* The function :func:`platform.popen` has been removed, it was deprecated since + Python 3.3: use :func:`os.popen` instead. + * The :meth:`~tkinter.ttk.Treeview.selection` method of the :class:`tkinter.ttk.Treeview` class no longer takes arguments. Using it with arguments for changing the selection was deprecated in Python 3.6. Use diff --git a/Lib/platform.py b/Lib/platform.py index b4d4744dadc7..98ee06f85ef1 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -227,15 +227,6 @@ def libc_ver(executable=sys.executable, lib='', version='', chunksize=16384): pos = m.end() return lib, version -def popen(cmd, mode='r', bufsize=-1): - - """ Portable popen() interface. - """ - import warnings - warnings.warn('use os.popen instead', DeprecationWarning, stacklevel=2) - return os.popen(cmd, mode, bufsize) - - def _norm_version(version, build=''): """ Normalize the version and build strings and return a single diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index c92da904fc5b..686f454827fd 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -3,9 +3,7 @@ import subprocess import sys import sysconfig -import tempfile import unittest -import warnings from test import support @@ -316,37 +314,6 @@ def test__comparable_version(self): self.assertLess(V('1.13++'), V('5.5.kw')) self.assertLess(V('0.960923'), V('2.2beta29')) - def test_popen(self): - mswindows = (sys.platform == "win32") - - if mswindows: - command = '"{}" -c "print(\'Hello\')"'.format(sys.executable) - else: - command = "'{}' -c 'print(\"Hello\")'".format(sys.executable) - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - with platform.popen(command) as stdout: - hello = stdout.read().strip() - stdout.close() - self.assertEqual(hello, "Hello") - - data = 'plop' - if mswindows: - command = '"{}" -c "import sys; data=sys.stdin.read(); exit(len(data))"' - else: - command = "'{}' -c 'import sys; data=sys.stdin.read(); exit(len(data))'" - command = command.format(sys.executable) - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - with platform.popen(command, 'w') as stdin: - stdout = stdin.write(data) - ret = stdin.close() - self.assertIsNotNone(ret) - if os.name == 'nt': - returncode = ret - else: - returncode = ret >> 8 - self.assertEqual(returncode, len(data)) if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS.d/next/Library/2018-11-29-00-55-33.bpo-35345.vepCSJ.rst b/Misc/NEWS.d/next/Library/2018-11-29-00-55-33.bpo-35345.vepCSJ.rst new file mode 100644 index 000000000000..e4d3b52c9ef5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-11-29-00-55-33.bpo-35345.vepCSJ.rst @@ -0,0 +1,2 @@ +The function `platform.popen` has been removed, it was deprecated since Python +3.3: use :func:`os.popen` instead.

1 0

closes bpo-35340: Add freegrammar to pgenheaders.h. (GH-10788)
by Benjamin Peterson Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/2e869a8f8280b5c786b3fde1f990e13927… commit: 2e869a8f8280b5c786b3fde1f990e13927625e7a branch: 2.7 author: Benjamin Peterson <benjamin(a)python.org> committer: GitHub <noreply(a)github.com> date: 2018-11-29T01:37:15-06:00 summary: closes bpo-35340: Add freegrammar to pgenheaders.h. (GH-10788) files: M Include/pgenheaders.h diff --git a/Include/pgenheaders.h b/Include/pgenheaders.h index 2049ae32bb1d..4843de6c023e 100644 --- a/Include/pgenheaders.h +++ b/Include/pgenheaders.h @@ -23,6 +23,7 @@ PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) #define delbitset _Py_delbitset #define dumptree _Py_dumptree #define findlabel _Py_findlabel +#define freegrammar _Py_freegrammar #define mergebitset _Py_mergebitset #define meta_grammar _Py_meta_grammar #define newbitset _Py_newbitset

1 0

bpo-28167: Remove platform._dist_try_harder() (GH-10787)
by Victor Stinner Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/7cc1fa40b76de34a0fe86162667c87ce7a… commit: 7cc1fa40b76de34a0fe86162667c87ce7a18f33d branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-11-29T03:14:03+01:00 summary: bpo-28167: Remove platform._dist_try_harder() (GH-10787) platform._dist_try_harder() was an helper function for platform.linux_distribution() which has been removed by the commit 8b94b41ab7b12f745dea744e8940631318816935. files: M Lib/platform.py diff --git a/Lib/platform.py b/Lib/platform.py index f7e24d739c6d..b4d4744dadc7 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -227,54 +227,6 @@ def libc_ver(executable=sys.executable, lib='', version='', chunksize=16384): pos = m.end() return lib, version -def _dist_try_harder(distname, version, id): - - """ Tries some special tricks to get the distribution - information in case the default method fails. - - Currently supports older SuSE Linux, Caldera OpenLinux and - Slackware Linux distributions. - - """ - if os.path.exists('/var/adm/inst-log/info'): - # SuSE Linux stores distribution information in that file - distname = 'SuSE' - for line in open('/var/adm/inst-log/info'): - tv = line.split() - if len(tv) == 2: - tag, value = tv - else: - continue - if tag == 'MIN_DIST_VERSION': - version = value.strip() - elif tag == 'DIST_IDENT': - values = value.split('-') - id = values[2] - return distname, version, id - - if os.path.exists('/etc/.installed'): - # Caldera OpenLinux has some infos in that file (thanks to Colin Kong) - for line in open('/etc/.installed'): - pkg = line.split('-') - if len(pkg) >= 2 and pkg[0] == 'OpenLinux': - # XXX does Caldera support non Intel platforms ? If yes, - # where can we find the needed id ? - return 'OpenLinux', pkg[1], id - - if os.path.isdir('/usr/lib/setup'): - # Check for slackware version tag file (thanks to Greg Andruk) - verfiles = os.listdir('/usr/lib/setup') - for n in range(len(verfiles)-1, -1, -1): - if verfiles[n][:14] != 'slack-version-': - del verfiles[n] - if verfiles: - verfiles.sort() - distname = 'slackware' - version = verfiles[-1][14:] - return distname, version, id - - return distname, version, id - def popen(cmd, mode='r', bufsize=-1): """ Portable popen() interface.

1 0

bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782)
by Miss Islington (bot) Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/833a7067a4d5621d024511d9166db7331c… commit: 833a7067a4d5621d024511d9166db7331c4650c9 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-28T16:57:18-08:00 summary: bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782) test_eintr no longer fails if the signal handler has not been called. (cherry picked from commit 2956bffbc00127af65f69e04d7979021a21d1288) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: M Lib/test/eintrdata/eintr_tester.py diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py index c2eaf0128a5f..aa7cfd14d9f9 100644 --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -69,8 +69,6 @@ def tearDown(self): signal.signal(signal.SIGALRM, self.orig_handler) if hasattr(faulthandler, 'cancel_dump_traceback_later'): faulthandler.cancel_dump_traceback_later() - # make sure that at least one signal has been received - self.assertGreater(self.signals, 0) def subprocess(self, *args, **kw): cmd_args = (sys.executable, '-c') + args

1 0

bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782)
by Miss Islington (bot) Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/2fa5b2ac4485c5c9083b4b0459dd9b691d… commit: 2fa5b2ac4485c5c9083b4b0459dd9b691daaea28 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-28T16:52:11-08:00 summary: bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782) test_eintr no longer fails if the signal handler has not been called. (cherry picked from commit 2956bffbc00127af65f69e04d7979021a21d1288) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: M Lib/test/eintrdata/eintr_tester.py diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py index c2eaf0128a5f..aa7cfd14d9f9 100644 --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -69,8 +69,6 @@ def tearDown(self): signal.signal(signal.SIGALRM, self.orig_handler) if hasattr(faulthandler, 'cancel_dump_traceback_later'): faulthandler.cancel_dump_traceback_later() - # make sure that at least one signal has been received - self.assertGreater(self.signals, 0) def subprocess(self, *args, **kw): cmd_args = (sys.executable, '-c') + args

1 0

bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782)
by Victor Stinner Nov. 29, 2018

Nov. 29, 2018

https://github.com/python/cpython/commit/2956bffbc00127af65f69e04d7979021a2… commit: 2956bffbc00127af65f69e04d7979021a21d1288 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-11-29T01:34:51+01:00 summary: bpo-35189, bpo-35316: Make test_eintr less strict (GH-10782) test_eintr no longer fails if the signal handler has not been called. files: M Lib/test/eintrdata/eintr_tester.py diff --git a/Lib/test/eintrdata/eintr_tester.py b/Lib/test/eintrdata/eintr_tester.py index c2eaf0128a5f..aa7cfd14d9f9 100644 --- a/Lib/test/eintrdata/eintr_tester.py +++ b/Lib/test/eintrdata/eintr_tester.py @@ -69,8 +69,6 @@ def tearDown(self): signal.signal(signal.SIGALRM, self.orig_handler) if hasattr(faulthandler, 'cancel_dump_traceback_later'): faulthandler.cancel_dump_traceback_later() - # make sure that at least one signal has been received - self.assertGreater(self.signals, 0) def subprocess(self, *args, **kw): cmd_args = (sys.executable, '-c') + args

1 0