Skip to content

Commit 4b57543

Browse files
committed
Merge tag 'v3.7.4rc1' into 3.7
2 parents 43b97ae + b26441e commit 4b57543

File tree

167 files changed

+1781
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+1781
-451
lines changed

Include/patchlevel.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
/*--start constants--*/
1919
#define PY_MAJOR_VERSION 3
2020
#define PY_MINOR_VERSION 7
21-
#define PY_MICRO_VERSION 3
22-
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
23-
#define PY_RELEASE_SERIAL 0
21+
#define PY_MICRO_VERSION 4
22+
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
23+
#define PY_RELEASE_SERIAL 1
2424

2525
/* Version as a string */
26-
#define PY_VERSION "3.7.3+"
26+
#define PY_VERSION "3.7.4rc1"
2727
/*--end constants--*/
2828

2929
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

Lib/pydoc_data/topics.py

Lines changed: 64 additions & 61 deletions
Large diffs are not rendered by default.

Mac/BuildScript/resources/ReadMe.rtf

Lines changed: 74 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf400
2-
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
2+
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
3+
\f3\fmodern\fcharset0 CourierNewPSMT;}
34
{\colortbl;\red255\green255\blue255;}
45
{\*\expandedcolortbl;;}
56
\margl1440\margr1440\vieww13380\viewh14600\viewkind0
@@ -9,86 +10,108 @@
910
\
1011
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
1112

12-
\b \cf0 \ul \ulc0 Which installer variant should I use?
13-
\b0 \ulnone \
13+
\f1\b \cf0 \ul \ulc0 Which installer variant should I use?
14+
\f0\b0 \ulnone \
1415
\
15-
For Python.3.7, python.org currently provides two installer variants for download: one that installs a
16-
\i 64-bit-only
17-
\i0 Python capable of running on
18-
\i macOS 10.9 (Mavericks)
19-
\i0 or later; and one that installs a
20-
\i 64-bit/32-bit Intel
21-
\i0 Python capable of running on
22-
\i macOS 10.6 (Snow Leopard)
23-
\i0 or later. (This ReadMe was installed with the
24-
\i $MACOSX_DEPLOYMENT_TARGET
25-
\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.
26-
\b \ul \
16+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
17+
18+
\f1\b \cf0 CHANGED in 3.7.4:
19+
\f0\b0 The
20+
\f1\b 10.6+ 64-/32-bit installer variant is being deprecated
21+
\f0\b0 .
22+
\f1\b Python 3.8.0
23+
\f0\b0 will
24+
\f1\b not
25+
\f0\b0 include a binary installer for 10.6+ and
26+
\f1\b future bugfix releases of 3.7.x
27+
\f0\b0 may not, either. Mac OS X 10.6 Snow Leopard was released in 2009 and has not been supported by Apple for many years including lack of security updates. It is becoming increasingly difficult to ensure new Python features and bug fixes are compatible with such old systems especially with Apple's deprecation and removal of 32-bit support in recent and upcoming macOS releases. We believe that there is now very little usage of this installer variant and so we would like to focus our resources on supporting newer systems. We do not plan to intentionally break Python support on 10.6 and we will consider bug fixes for problems found when building from source on 10.6. \
28+
\
29+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
30+
\cf0 For Python.3.7, python.org currently provides two installer variants for download: one that installs a
31+
\f2\i 64-bit-only
32+
\f0\i0 Python capable of running on
33+
\f2\i macOS 10.9 (Mavericks)
34+
\f0\i0 or later; and one that installs a
35+
\f2\i 64-bit/32-bit Intel
36+
\f0\i0 Python capable of running on
37+
\f2\i macOS 10.6 (Snow Leopard)
38+
\f0\i0 or later. (This ReadMe was installed with the
39+
\f2\i $MACOSX_DEPLOYMENT_TARGET
40+
\f0\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.
41+
\f1\b \ul \
2742
\
2843
Certificate verification and OpenSSL\
2944
30-
\b0 \ulnone \
31-
This variant of Python 3.7 includes its own private copy of OpenSSL 1.1.0. The deprecated Apple-supplied OpenSSL libraries are no longer used. This means that the trust certificates in system and user keychains managed by the
32-
\i Keychain Access
33-
\i0 application and the
34-
\i security
35-
\i0 command line utility are no longer used as defaults by the Python
36-
\f1 ssl
45+
\f0\b0 \ulnone \
46+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
47+
\cf0 This variant of Python 3.7 includes its own private copy of OpenSSL 1.1.1. The deprecated Apple-supplied OpenSSL libraries are no longer used. This means that the trust certificates in system and user keychains managed by the
48+
\f2\i Keychain Access
49+
\f0\i0 application and the
50+
\f2\i security
51+
\f0\i0 command line utility are no longer used as defaults by the Python
52+
\f3 ssl
3753
\f0 module. A sample command script is included in
38-
\f1 /Applications/Python 3.7
54+
\f3 /Applications/Python 3.7
3955
\f0 to install a curated bundle of default root certificates from the third-party
40-
\f1 certifi
56+
\f3 certifi
4157
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). If you choose to use
42-
\f1 certifi
58+
\f3 certifi
4359
\f0 , you should consider subscribing to the{\field{\*\fldinst{HYPERLINK "https://certifi.io/en/latest/"}}{\fldrslt project's email update service}} to be notified when the certificate bundle is updated.\
44-
\
60+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
61+
\cf0 \
4562
The bundled
46-
\f1 pip
63+
\f3 pip
4764
\f0 included with this installer has its own default certificate store for verifying download connections.\
48-
\
65+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
66+
67+
\f1\b \cf0 \
68+
CHANGED in 3.7.4:
69+
\f0\b0 OpenSSL has been updated from 1.1.0 to 1.1.1.\
70+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
71+
\cf0 \
4972

50-
\b \ul Using IDLE or other Tk applications
51-
\b0 \ulnone \
73+
\f1\b \ul Using IDLE or other Tk applications
74+
\f0\b0 \ulnone \
5275
\
5376
Both installer variants now come with their own private version of Tcl/Tk 8.6. They no longer use system-supplied or third-party supplied versions of Tcl/Tk as in previous releases.\
5477

55-
\b \ul \
78+
\f1\b \ul \
5679
Other changes\
5780
58-
\b0 \ulnone \
81+
\f0\b0 \ulnone \
5982
For other changes in this release, see the
60-
\i What's new
61-
\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its
62-
\i Release Notes
63-
\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
83+
\f2\i What's new
84+
\f0\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its
85+
\f2\i Release Notes
86+
\f0\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
6487

65-
\b \ul \
88+
\f1\b \ul \
6689
Python 3 and Python 2 Co-existence\
6790
68-
\b0 \ulnone \
91+
\f0\b0 \ulnone \
6992
Python.org Python $VERSION and 2.7.x versions can both be installed on your system and will not conflict. Command names for Python 3 contain a 3 in them,
70-
\f1 python3
93+
\f3 python3
7194
\f0 (or
72-
\f1 python$VERSION
95+
\f3 python$VERSION
7396
\f0 ),
74-
\f1 idle3
97+
\f3 idle3
7598
\f0 (or i
76-
\f1 dle$VERSION
99+
\f3 dle$VERSION
77100
\f0 ),
78-
\f1 pip3
101+
\f3 pip3
79102
\f0 (or
80-
\f1 pip$VERSION
103+
\f3 pip$VERSION
81104
\f0 ), etc. Python 2.7 command names contain a 2 or no digit:
82-
\f1 python2
105+
\f3 python2
83106
\f0 (or
84-
\f1 python2.7
107+
\f3 python2.7
85108
\f0 or
86-
\f1 python
109+
\f3 python
87110
\f0 ),
88-
\f1 idle2
111+
\f3 idle2
89112
\f0 (or
90-
\f1 idle2.7
113+
\f3 idle2.7
91114
\f0 or
92-
\f1 idle
115+
\f3 idle
93116
\f0 ), etc.\
94117
}

Mac/BuildScript/resources/Welcome.rtf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf100
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
22
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
33
}
44
{\colortbl;\red255\green255\blue255;}
@@ -25,4 +25,8 @@ At the end of this install, click on
2525

2626
\f1\b NEW in 3.7.0:
2727
\f0\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support (no additional third-party downloads!), OpenSSL 1.1.0, and more!\
28+
29+
\f1\b \
30+
CHANGED in 3.7.4:
31+
\f0\b0 OpenSSL 1.1.1, 10.6+ 64-/32-bit installer variant deprecated\
2832
}

0 commit comments

Comments
 (0)