Mailman 3 February 2018 - Python-checkins

bpo-30928: Update idlelib/NEWS.txt, possibly for 3.7.0b2 (GH-5932)
by Miss Islington (bot) Feb. 28, 2018

Feb. 28, 2018

https://github.com/python/cpython/commit/0ea49fc0bfa10205895f9fb78b4d6659b2… commit: 0ea49fc0bfa10205895f9fb78b4d6659b2946883 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-02-27T16:07:45-08:00 summary: bpo-30928: Update idlelib/NEWS.txt, possibly for 3.7.0b2 (GH-5932) (cherry picked from commit 0954c9e9c8fbea452f56120df592f2061d3209c7) Co-authored-by: Terry Jan Reedy <tjreedy(… [View More]

1 0

bpo-30928: Update idlelib/NEWS.txt, possibly for 3.7.0b2 (GH-5932)
by Terry Jan Reedy Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/0954c9e9c8fbea452f56120df592f2061d… commit: 0954c9e9c8fbea452f56120df592f2061d3209c7 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2018-02-27T18:36:21-05:00 summary: bpo-30928: Update idlelib/NEWS.txt, possibly for 3.7.0b2 (GH-5932) files: M Lib/idlelib/NEWS.txt diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index d616a740d5f5..c4aab2ee78b0 100644 --- a/Lib/idlelib/… [View More]

1 0

Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" (GH-5912) (GH-5931)
by Ned Deily Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/b7dcae358e9d5a3ac9dafec9f6b64e9a66… commit: b7dcae358e9d5a3ac9dafec9f6b64e9a66843ad8 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Ned Deily <nad(a)python.org> date: 2018-02-27T18:30:30-05:00 summary: Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" (GH-5912) (GH-5931) * Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" This reverts commit … [View More]dd42cb71f2cb02f3a32f016137b12a146bc0d0e2. (cherry picked from commit be50a7b627d0aa37e08fa8e2d5568891f19903ce) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Doc/library/subprocess.rst M Lib/subprocess.py M Lib/test/test_subprocess.py M Misc/NEWS.d/3.7.0b1.rst diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index a22afe041850..db7a88af6bea 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -339,12 +339,12 @@ functions. the class uses the Windows ``CreateProcess()`` function. The arguments to :class:`Popen` are as follows. - *args* should be a sequence of program arguments or else a single string or - :term:`path-like object`. By default, the program to execute is the first - item in *args* if *args* is a sequence. If *args* is a string, the - interpretation is platform-dependent and described below. See the *shell* - and *executable* arguments for additional differences from the default - behavior. Unless otherwise stated, it is recommended to pass *args* as a sequence. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. On POSIX, if *args* is a string, the string is interpreted as the name or path of the program to execute. However, this can only be done if not @@ -558,10 +558,6 @@ functions. Popen destructor now emits a :exc:`ResourceWarning` warning if the child process is still running. - .. versionchanged:: 3.7 - *args*, or the first element of *args* if *args* is a sequence, can now - be a :term:`path-like object`. - Exceptions ^^^^^^^^^^ diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 2723bc9e4274..93635ee61f7e 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1097,12 +1097,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds, assert not pass_fds, "pass_fds not supported on Windows." if not isinstance(args, str): - try: - args = os.fsdecode(args) # os.PathLike -> str - except TypeError: # not an os.PathLike, must be a sequence. - args = list(args) - args[0] = os.fsdecode(args[0]) # os.PathLike -> str - args = list2cmdline(args) + args = list2cmdline(args) # Process startup details if startupinfo is None: @@ -1374,10 +1369,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds, if isinstance(args, (str, bytes)): args = [args] else: - try: - args = list(args) - except TypeError: # os.PathLike instead of a sequence? - args = [os.fsencode(args)] # os.PathLike -> [str] + args = list(args) if shell: # On Android the default shell is at '/system/bin/sh'. diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index b3ccb0de63a8..46cb5f117e84 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1475,37 +1475,6 @@ def test_run_kwargs(self): env=newenv) self.assertEqual(cp.returncode, 33) - def test_run_with_pathlike_path(self): - # bpo-31961: test run(pathlike_object) - class Path: - def __fspath__(self): - # the name of a command that can be run without - # any argumenets that exit fast - return 'dir' if mswindows else 'ls' - - path = Path() - if mswindows: - res = subprocess.run(path, stdout=subprocess.DEVNULL, shell=True) - else: - res = subprocess.run(path, stdout=subprocess.DEVNULL) - - self.assertEqual(res.returncode, 0) - - def test_run_with_pathlike_path_and_arguments(self): - # bpo-31961: test run([pathlike_object, 'additional arguments']) - class Path: - def __fspath__(self): - # the name of a command that can be run without - # any argumenets that exits fast - return sys.executable - - path = Path() - - args = [path, '-c', 'import sys; sys.exit(57)'] - res = subprocess.run(args) - - self.assertEqual(res.returncode, 57) - def test_capture_output(self): cp = self.run_python(("import sys;" "sys.stdout.write('BDFL'); " diff --git a/Misc/NEWS.d/3.7.0b1.rst b/Misc/NEWS.d/3.7.0b1.rst index bd3a6111df0b..ec7b3c8ecf78 100644 --- a/Misc/NEWS.d/3.7.0b1.rst +++ b/Misc/NEWS.d/3.7.0b1.rst @@ -630,6 +630,7 @@ Add contextlib.AsyncExitStack. Patch by Alexander Mohr and Ilya Kulakov. .. nonce: x5Sv0R .. section: Library +*Removed in Python 3.7.0b2.* The *args* argument of subprocess.Popen can now be a :term:`path-like object`. If *args* is given as a sequence, it's first element can now be a :term:`path-like object` as well. [View Less]

1 0

Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" (#5912)
by Ned Deily Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/be50a7b627d0aa37e08fa8e2d5568891f1… commit: be50a7b627d0aa37e08fa8e2d5568891f19903ce branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: Ned Deily <nad(a)python.org> date: 2018-02-27T18:03:46-05:00 summary: Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" (#5912) * Revert "bpo-31961: subprocess now accepts path-like args (GH-4329)" This reverts commit dd42cb71f2cb02f3a32f016137b12a146bc0d0e2. … [View More]files: M Doc/library/subprocess.rst M Lib/subprocess.py M Lib/test/test_subprocess.py M Misc/NEWS.d/3.7.0b1.rst diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index a22afe041850..db7a88af6bea 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -339,12 +339,12 @@ functions. the class uses the Windows ``CreateProcess()`` function. The arguments to :class:`Popen` are as follows. - *args* should be a sequence of program arguments or else a single string or - :term:`path-like object`. By default, the program to execute is the first - item in *args* if *args* is a sequence. If *args* is a string, the - interpretation is platform-dependent and described below. See the *shell* - and *executable* arguments for additional differences from the default - behavior. Unless otherwise stated, it is recommended to pass *args* as a sequence. + *args* should be a sequence of program arguments or else a single string. + By default, the program to execute is the first item in *args* if *args* is + a sequence. If *args* is a string, the interpretation is + platform-dependent and described below. See the *shell* and *executable* + arguments for additional differences from the default behavior. Unless + otherwise stated, it is recommended to pass *args* as a sequence. On POSIX, if *args* is a string, the string is interpreted as the name or path of the program to execute. However, this can only be done if not @@ -558,10 +558,6 @@ functions. Popen destructor now emits a :exc:`ResourceWarning` warning if the child process is still running. - .. versionchanged:: 3.7 - *args*, or the first element of *args* if *args* is a sequence, can now - be a :term:`path-like object`. - Exceptions ^^^^^^^^^^ diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 2723bc9e4274..93635ee61f7e 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1097,12 +1097,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds, assert not pass_fds, "pass_fds not supported on Windows." if not isinstance(args, str): - try: - args = os.fsdecode(args) # os.PathLike -> str - except TypeError: # not an os.PathLike, must be a sequence. - args = list(args) - args[0] = os.fsdecode(args[0]) # os.PathLike -> str - args = list2cmdline(args) + args = list2cmdline(args) # Process startup details if startupinfo is None: @@ -1374,10 +1369,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds, if isinstance(args, (str, bytes)): args = [args] else: - try: - args = list(args) - except TypeError: # os.PathLike instead of a sequence? - args = [os.fsencode(args)] # os.PathLike -> [str] + args = list(args) if shell: # On Android the default shell is at '/system/bin/sh'. diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index b3ccb0de63a8..46cb5f117e84 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1475,37 +1475,6 @@ def test_run_kwargs(self): env=newenv) self.assertEqual(cp.returncode, 33) - def test_run_with_pathlike_path(self): - # bpo-31961: test run(pathlike_object) - class Path: - def __fspath__(self): - # the name of a command that can be run without - # any argumenets that exit fast - return 'dir' if mswindows else 'ls' - - path = Path() - if mswindows: - res = subprocess.run(path, stdout=subprocess.DEVNULL, shell=True) - else: - res = subprocess.run(path, stdout=subprocess.DEVNULL) - - self.assertEqual(res.returncode, 0) - - def test_run_with_pathlike_path_and_arguments(self): - # bpo-31961: test run([pathlike_object, 'additional arguments']) - class Path: - def __fspath__(self): - # the name of a command that can be run without - # any argumenets that exits fast - return sys.executable - - path = Path() - - args = [path, '-c', 'import sys; sys.exit(57)'] - res = subprocess.run(args) - - self.assertEqual(res.returncode, 57) - def test_capture_output(self): cp = self.run_python(("import sys;" "sys.stdout.write('BDFL'); " diff --git a/Misc/NEWS.d/3.7.0b1.rst b/Misc/NEWS.d/3.7.0b1.rst index bd3a6111df0b..ec7b3c8ecf78 100644 --- a/Misc/NEWS.d/3.7.0b1.rst +++ b/Misc/NEWS.d/3.7.0b1.rst @@ -630,6 +630,7 @@ Add contextlib.AsyncExitStack. Patch by Alexander Mohr and Ilya Kulakov. .. nonce: x5Sv0R .. section: Library +*Removed in Python 3.7.0b2.* The *args* argument of subprocess.Popen can now be a :term:`path-like object`. If *args* is given as a sequence, it's first element can now be a :term:`path-like object` as well. [View Less]

1 0

bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8
by Ned Deily Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/a7edca7122cb952874e74d64d693c5b938… commit: a7edca7122cb952874e74d64d693c5b938c758cb branch: 3.7 author: Ned Deily <nad(a)python.org> committer: Ned Deily <nad(a)python.org> date: 2018-02-27T17:43:53-05:00 summary: bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8 files: A Mac/BuildScript/tk868_on_10_8_10_9.patch A Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst M Mac/BuildScript/build-installer.py diff --git a/Mac/… [View More]BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index bacdbfb0feba..7f6228ba444f 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -225,9 +225,9 @@ def library_recipes(): if internalTk(): result.extend([ dict( - name="Tcl 8.6.7", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.7-src.tar.gz", - checksum='5673aaf45b5de5d8dd80bb3daaeb8838', + name="Tcl 8.6.8", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz", + checksum='81656d3367af032e0ae6157eff134f89', buildDir="unix", configure_pre=[ '--enable-shared', @@ -241,9 +241,12 @@ def library_recipes(): }, ), dict( - name="Tk 8.6.7", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.7-src.tar.gz", - checksum='46ea9c0165c515d87393700f4891ab6f', + name="Tk 8.6.8", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz", + checksum='5e0faecba458ee1386078fb228d008ba', + patches=[ + "tk868_on_10_8_10_9.patch", + ], buildDir="unix", configure_pre=[ '--enable-aqua', diff --git a/Mac/BuildScript/tk868_on_10_8_10_9.patch b/Mac/BuildScript/tk868_on_10_8_10_9.patch new file mode 100644 index 000000000000..8fe10604a68c --- /dev/null +++ b/Mac/BuildScript/tk868_on_10_8_10_9.patch @@ -0,0 +1,18 @@ +Fix build failure with +quartz variant on OS X 10.8 and 10.9. +Even though Gestalt was deprecated in OS X 10.8, it should work fine +through OS X 10.9, and its replacement NSOperatingSystemVersion was +not introduced until OS X 10.10. + +Patch from MacPorts project and reported upstream: +https://trac.macports.org/ticket/55649 +--- tk8.6.8/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600 ++++ tk8.6.8-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600 +@@ -175,7 +175,7 @@ + { + int major, minor, patch; + +-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 ++#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 + Gestalt(gestaltSystemVersionMajor, (SInt32*)&major); + Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor); + Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch); diff --git a/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst b/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst new file mode 100644 index 000000000000..73e69a9b7119 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst @@ -0,0 +1 @@ +Update macOS 10.9+ installer to Tcl/Tk 8.6.8. [View Less]

1 0

Update macOS installer resources
by Ned Deily Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/cc5ac04c07097218477064a38d551f62fe… commit: cc5ac04c07097218477064a38d551f62fe682447 branch: master author: Ned Deily <nad(a)python.org> committer: Ned Deily <nad(a)python.org> date: 2018-02-27T17:39:50-05:00 summary: Update macOS installer resources files: M Mac/BuildScript/resources/ReadMe.rtf M Mac/BuildScript/resources/Welcome.rtf M Mac/BuildScript/scripts/postflight.documentation diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/… [View More]BuildScript/resources/ReadMe.rtf index cb005af7f051..aecbaa353cbf 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -5,7 +5,7 @@ \margl1440\margr1440\vieww13380\viewh14600\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\fs24 \cf0 This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ +\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 @@ -19,32 +19,18 @@ \b0 \ulnone \ \ For Python.3.7, python.org currently provides two installer variants for download: one that installs a -\i 64-bit/32-bit Intel -\i0 Python capable of running on -\i macOS 10.6 (Snow Leopard) -\i0 or later; and one that installs a \i 64-bit-only \i0 Python capable of running on \i macOS 10.9 (Mavericks) -\i0 or later. This ReadMe was installed with the +\i0 or later; and one that installs a +\i 64-bit/32-bit Intel +\i0 Python capable of running on +\i macOS 10.6 (Snow Leopard) +\i0 or later. (This ReadMe was installed with the \i $MACOSX_DEPLOYMENT_TARGET -\i0 variant. Use the 10.6 variant if you are running on macOS 10.6 through 10.8 or if you want to produce standalone applications that can run on systems from 10.6. If you are running on macOS 10.9 or later and if you have no need for compatibility with older systems, use the 10.9 variant. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in macOS itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file. +\i0 variant.) If you are running on macOS 10.9 or later and if you have no need for compatibility with older systems, use the 10.9 variant. Use the 10.6 variant if you are running on macOS 10.6 through 10.8 or if you want to produce standalone applications that can run on systems from 10.6. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in macOS itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file. \b \ul \ \ -Using IDLE or other Tk applications [NEW/CHANGED in 3.7.0b1] -\b0 \ulnone \ -\ -The 10.9+ installer variant comes with its own private version of Tcl/Tk 8.6. It does not use system-supplied or third-party supplied versions of Tcl/Tk.\ -\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\cf0 For the 10.6+ variant, you continue to need to install a newer third-party version of the -\i Tcl/Tk -\i0 8.5 (not 8.6) frameworks to use IDLE or other programs that use the Tkinter graphical user interface toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of -\i Tcl/Tk -\i0 for this version of Python and of macOS.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 - -\b \cf0 \ul \ulc0 \ Certificate verification and OpenSSL \{UPDATED in 3.7.0b1]\ \b0 \ulnone \ @@ -67,7 +53,19 @@ The bundled \f0 included with this installer has its own default certificate store for verifying download connections.\ \ -\b \ul Other changes\ +\b \ul Using IDLE or other Tk applications [NEW/CHANGED in 3.7.0b1] +\b0 \ulnone \ +\ +The 10.9+ installer variant comes with its own private version of Tcl/Tk 8.6. It does not use system-supplied or third-party supplied versions of Tcl/Tk.\ +\ +For the 10.6+ variant, you continue to need to install a newer third-party version of the +\i Tcl/Tk +\i0 8.5 (not 8.6) frameworks to use IDLE or other programs that use the Tkinter graphical user interface toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of +\i Tcl/Tk +\i0 for this version of Python and of macOS.\ + +\b \ul \ +Other changes\ \b0 \ulnone \ For other changes in this release, see the diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf index 4908fed0eaa5..92a843077d78 100644 --- a/Mac/BuildScript/resources/Welcome.rtf +++ b/Mac/BuildScript/resources/Welcome.rtf @@ -8,12 +8,12 @@ \f0\fs24 \cf0 This package will install \b Python $FULL_VERSION \b0 for -\b Mac OS X $MACOSX_DEPLOYMENT_TARGET +\b macOS $MACOSX_DEPLOYMENT_TARGET \b0 .\ \ -\b Python for Mac OS X -\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac OS X users including an integrated development environment +\b Python for macOS +\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment \b IDLE \b0 .\ \ @@ -24,13 +24,4 @@ \b NEW in 3.7.0b1: \b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support in the 10.9+ variant (no additional third-party downloads!), OpenSSL 1.1.0g, and more!\ -\ - -\b IMPORTANT: -\b0 -\b IDLE -\b0 and other programs using the -\b tkinter -\b0 graphical user interface toolkit require specific versions of the -\b Tcl/Tk -\b0 platform independent windowing toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information on supported and recommended versions of Tcl/Tk for this version of Python and Mac OS X.} \ No newline at end of file +} \ No newline at end of file diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation index b9f28a515215..3cbbc1bf10ca 100755 --- a/Mac/BuildScript/scripts/postflight.documentation +++ b/Mac/BuildScript/scripts/postflight.documentation @@ -12,6 +12,7 @@ SHARE_DOCDIR_TO_FWK="../../.." # make link in /Applications/Python m.n/ for Finder users if [ -d "${APPDIR}" ]; then ln -fhs "${FWK_DOCDIR}/index.html" "${APPDIR}/Python Documentation.html" + open "${APPDIR}" || true # open the applications folder fi # make share/doc link in framework for command line users [View Less]

1 0

bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8
by Ned Deily Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/9189e95d9c6691de18783b2e9213ec2dc1… commit: 9189e95d9c6691de18783b2e9213ec2dc18fd0c5 branch: master author: Ned Deily <nad(a)python.org> committer: Ned Deily <nad(a)python.org> date: 2018-02-27T17:36:12-05:00 summary: bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8 files: A Mac/BuildScript/tk868_on_10_8_10_9.patch A Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst M Mac/BuildScript/build-installer.py diff --git a/Mac/… [View More]BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index bacdbfb0feba..7f6228ba444f 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -225,9 +225,9 @@ def library_recipes(): if internalTk(): result.extend([ dict( - name="Tcl 8.6.7", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.7-src.tar.gz", - checksum='5673aaf45b5de5d8dd80bb3daaeb8838', + name="Tcl 8.6.8", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz", + checksum='81656d3367af032e0ae6157eff134f89', buildDir="unix", configure_pre=[ '--enable-shared', @@ -241,9 +241,12 @@ def library_recipes(): }, ), dict( - name="Tk 8.6.7", - url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.7-src.tar.gz", - checksum='46ea9c0165c515d87393700f4891ab6f', + name="Tk 8.6.8", + url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz", + checksum='5e0faecba458ee1386078fb228d008ba', + patches=[ + "tk868_on_10_8_10_9.patch", + ], buildDir="unix", configure_pre=[ '--enable-aqua', diff --git a/Mac/BuildScript/tk868_on_10_8_10_9.patch b/Mac/BuildScript/tk868_on_10_8_10_9.patch new file mode 100644 index 000000000000..8fe10604a68c --- /dev/null +++ b/Mac/BuildScript/tk868_on_10_8_10_9.patch @@ -0,0 +1,18 @@ +Fix build failure with +quartz variant on OS X 10.8 and 10.9. +Even though Gestalt was deprecated in OS X 10.8, it should work fine +through OS X 10.9, and its replacement NSOperatingSystemVersion was +not introduced until OS X 10.10. + +Patch from MacPorts project and reported upstream: +https://trac.macports.org/ticket/55649 +--- tk8.6.8/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600 ++++ tk8.6.8-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600 +@@ -175,7 +175,7 @@ + { + int major, minor, patch; + +-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 ++#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 + Gestalt(gestaltSystemVersionMajor, (SInt32*)&major); + Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor); + Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch); diff --git a/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst b/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst new file mode 100644 index 000000000000..73e69a9b7119 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst @@ -0,0 +1 @@ +Update macOS 10.9+ installer to Tcl/Tk 8.6.8. [View Less]

1 0

bpo-31355: Travis-CI: re-enable macOS job (#5858)
by Antoine Pitrou Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/d7687eb4b66c9f675b112eff1169326a17… commit: d7687eb4b66c9f675b112eff1169326a1766c111 branch: master author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2018-02-27T21:40:37+01:00 summary: bpo-31355: Travis-CI: re-enable macOS job (#5858) The long build queues that plagued macOS builds on Travis seem to be a thing of the past now. files: M .travis.yml M Tools/scripts/smelly.py diff --git a/.travis.yml b/.… [View More]travis.yml index ab43318975fb..292b9c687638 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,15 @@ matrix: - python -m pip install sphinx~=1.6.1 blurb script: - make check suspicious html SPHINXOPTS="-q -W -j4" + - os: osx + language: c + compiler: clang + # Testing under macOS is optional until testing stability has been demonstrated. + env: OPTIONAL=true + before_install: + # Python 3 is needed for Argument Clinic and multissl + - brew install xz python3 + - export PATH=$(brew --prefix)/bin:$(brew --prefix)/sbin:$PATH - os: linux language: c compiler: gcc @@ -76,9 +85,9 @@ before_install: - set -e - | # Check short-circuit conditions - if [ "${TESTING}" != "docs" ] + if [[ "${TESTING}" != "docs" ]] then - if [ "$TRAVIS_PULL_REQUEST" = "false" ] + if [[ "$TRAVIS_PULL_REQUEST" == "false" ]] then echo "Not a PR, doing full build." else @@ -101,7 +110,7 @@ before_install: install: - | # Install OpenSSL as necessary - if [ "${TESTING}" != "docs" ] + if [[ "${TESTING}" != "docs" ]] then # clang complains about unused-parameter a lot, redirect stderr python3 Tools/ssl/multissltests.py --steps=library \ diff --git a/Tools/scripts/smelly.py b/Tools/scripts/smelly.py index 212eedb30bc3..43d091654d2d 100755 --- a/Tools/scripts/smelly.py +++ b/Tools/scripts/smelly.py @@ -27,6 +27,11 @@ def get_exported_symbols(): def get_smelly_symbols(stdout): symbols = [] ignored_symtypes = set() + + allowed_prefixes = ('Py', '_Py') + if sys.platform == 'darwin': + allowed_prefixes += ('__Py',) + for line in stdout.splitlines(): # Split line '0000000000001b80 D PyTextIOWrapper_Type' if not line: @@ -47,7 +52,7 @@ def get_smelly_symbols(stdout): continue symbol = parts[-1] - if symbol.startswith(('Py', '_Py')): + if symbol.startswith(allowed_prefixes): continue symbol = '%s (type: %s)' % (symbol, symtype) symbols.append(symbol) [View Less]

1 0

bpo-10381, bpo-32403: What's new entries for changes to datetime (gh-5814) (gh-5929)
by Alexander Belopolsky Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/fff596f792a0752b0e571fa57809e5752a… commit: fff596f792a0752b0e571fa57809e5752aba6353 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Alexander Belopolsky <abalkin(a)users.noreply.github.com> date: 2018-02-27T14:58:28-05:00 summary: bpo-10381, bpo-32403: What's new entries for changes to datetime (gh-5814) (gh-5929) * Add What's New entry for addition of datetime.timezone to the C API … [View More]

1 0

bpo-10381, bpo-32403: What's new entries for changes to datetime (gh-5814)
by Alexander Belopolsky Feb. 27, 2018

Feb. 27, 2018

https://github.com/python/cpython/commit/5bd04f964b4f1bcdbd0fa36de04f087c2d… commit: 5bd04f964b4f1bcdbd0fa36de04f087c2db07cfe branch: master author: Paul Ganssle <pganssle(a)users.noreply.github.com> committer: Alexander Belopolsky <abalkin(a)users.noreply.github.com> date: 2018-02-27T14:41:30-05:00 summary: bpo-10381, bpo-32403: What's new entries for changes to datetime (gh-5814) * Add What's New entry for addition of datetime.timezone to the C API Closes bpo-10381 * Add what'… [View More]

1 0