Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9cb51f4

Browse files
authoredOct 14, 2019
Update macOS installer display files for 3.9.0a1 (pythonGH-16765)
1 parent a329153 commit 9cb51f4

File tree

3 files changed

+54
-69
lines changed

3 files changed

+54
-69
lines changed
 

‎Mac/BuildScript/resources/License.rtf

+26-25
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
2-
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPS-BoldMT;\f2\fmodern\fcharset0 CourierNewPSMT;
3-
}
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
2+
{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fmodern\fcharset0 CourierNewPS-BoldMT;
3+
\f3\fmodern\fcharset0 CourierNewPSMT;}
44
{\colortbl;\red255\green255\blue255;}
5+
{\*\expandedcolortbl;;}
56
\margl1440\margr1440\vieww14620\viewh13380\viewkind0
6-
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
7+
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
78

89
\f0\b\fs36 \cf0 \ul \ulc0 HISTORY AND LICENSE\
910
1011
\fs24 \
1112
HISTORY OF THE SOFTWARE\
1213
13-
\b0 \ulnone \
14+
\f1\b0 \ulnone \
1415
Python was created in the early 1990s by Guido van Rossum at Stichting Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands as a successor of a language called ABC. Guido remains Python's principal author, although it includes many contributions from others.\
1516
\
1617
In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\
@@ -20,10 +21,10 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to f
2021
All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\
2122
\
2223

23-
\f1\b Release Derived Year Owner GPL-\
24+
\f2\b Release Derived Year Owner GPL-\
2425
from compatible?\
2526
26-
\f2\b0 \
27+
\f3\b0 \
2728
0.9.0 thru 1.2 n/a 1991-1995 CWI yes\
2829
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes\
2930
1.6 1.5.2 2000 CNRI no\
@@ -36,25 +37,25 @@ All Python releases are Open Source (see http://www.opensource.org for the Open
3637
2.1.3 2.1.2 2002 PSF yes\
3738
2.2 and above 2.1.1 2001-now PSF yes\
3839

39-
\f0 \
40+
\f1 \
4041

41-
\b Note:
42-
\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
42+
\f0\b Note:
43+
\f1\b0 GPL-compatible doesn't mean that we're distributing Python under the GPL. All Python licenses, unlike the GPL, let you distribute a modified version without making your changes open source. The GPL-compatible licenses make it possible to combine Python with other software that is released under the GPL; the others don't.\
4344
\
4445
Thanks to the many outside volunteers who have worked under Guido's direction to make these releases possible.\
4546
\
4647
\
4748

48-
\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
49+
\f0\b \ul TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON\
4950
50-
\b0 \ulnone \
51+
\f1\b0 \ulnone \
5152

52-
\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
53+
\f0\b PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2\
5354
54-
\b0 \
55+
\f1\b0 \
5556
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.\
5657
\
57-
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
58+
2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.\
5859
\
5960
3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.\
6061
\
@@ -70,9 +71,9 @@ Thanks to the many outside volunteers who have worked under Guido's direction to
7071
\
7172
\
7273

73-
\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
74+
\f0\b BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0\
7475
75-
\b0 \
76+
\f1\b0 \
7677
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
7778
\
7879
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization ("Licensee") accessing and otherwise using this software in source or binary form and its associated documentation ("the Software").\
@@ -91,9 +92,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
9192
\
9293
\
9394

94-
\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
95+
\f0\b CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1\
9596
96-
\b0 \
97+
\f1\b0 \
9798
1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\
9899
\
99100
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
@@ -114,9 +115,9 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
114115
\
115116
\
116117

117-
\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
118+
\f0\b CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\
118119
119-
\b0 \
120+
\f1\b0 \
120121
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved.\
121122
\
122123
Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Stichting Mathematisch Centrum or CWI not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.\
@@ -125,16 +126,16 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT
125126
\
126127
\
127128

128-
\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
129+
\f0\b \ul LICENSES AND ACKNOWLEDGEMENTS FOR INCORPORATED SOFTWARE\
129130
130-
\b0 \ulnone \
131+
\f1\b0 \ulnone \
131132
This installer incorporates portions of the following third-party software:\
132133
\
133134

134-
\f2 $THIRD_PARTY_LIBS\
135+
\f3 $THIRD_PARTY_LIBS\
135136
\
136137

137-
\f0 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
138+
\f1 For licenses and acknowledgements for these and other third-party software incorporated in this Python distribution, please refer to the on-line documentation {\field{\*\fldinst{HYPERLINK "https://docs.python.org/$VERSION/license.html#licenses-and-acknowledgements-for-incorporated-software"}}{\fldrslt here}}.\
138139
\
139140
\
140141
\

‎Mac/BuildScript/resources/ReadMe.rtf

+21-39
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
22
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
33
\f3\fmodern\fcharset0 CourierNewPSMT;}
44
{\colortbl;\red255\green255\blue255;}
@@ -11,7 +11,7 @@
1111
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
1212

1313
\f1\b \cf0 NOTE:
14-
\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8. It is not intended for production use.\
14+
\f0\b0 This is an alpha test preview of Python 3.9.0, the next feature release of Python 3. It is not intended for production use.\
1515
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
1616
\cf0 \
1717
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
@@ -26,60 +26,42 @@ This package includes its own private copy of OpenSSL 1.1.1. The trust certifi
2626
\f0\i0 command line utility are not used as defaults by the Python
2727
\f3 ssl
2828
\f0 module. A sample command script is included in
29-
\f3 /Applications/Python 3.8
29+
\f3 /Applications/Python 3.9
3030
\f0 to install a curated bundle of default root certificates from the third-party
3131
\f3 certifi
32-
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). If you choose to use
33-
\f3 certifi
34-
\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.\
32+
\f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). Double-click on
33+
\f3 Install Certificates
34+
\f0 to run it.\
3535
\
3636
The bundled
3737
\f3 pip
38-
\f0 included with this installer has its own default certificate store for verifying download connections.\
38+
\f0 has its own default certificate store for verifying download connections.\
3939
\
4040

4141
\f1\b \ul Using IDLE or other Tk applications
4242
\f0\b0 \ulnone \
4343
\
4444
This package includes its own private version of Tcl/Tk 8.6. It does not use any system-supplied or third-party supplied versions of Tcl/Tk.\
45+
\
46+
Due to new security checks on macOS 10.15 Catalina, when launching IDLE macOS may open a window with a message
47+
\f1\b "Python" would like to access files in your Documents folder
48+
\f0\b0 . This is normal as IDLE uses your
49+
\f1\b Documents
50+
\f0\b0 folder as its default when opening and saving files; you can still choose other locations in the
51+
\f1\b Open
52+
\f0\b0 and
53+
\f1\b Save
54+
\f0\b0 file dialog windows. Click on the
55+
\f1\b OK
56+
\f0\b0 button to proceed.\
57+
\
4558

46-
\f1\b \ul \
47-
Other changes\
59+
\f1\b \ul Other changes\
4860
4961
\f0\b0 \ulnone \
5062
For other changes in this release, see the
5163
\f2\i What's new
5264
\f0\i0 section in the {\field{\*\fldinst{HYPERLINK "https://www.python.org/doc/"}}{\fldrslt Documentation Set}} for this release and its
5365
\f2\i Release Notes
5466
\f0\i0 link at {\field{\*\fldinst{HYPERLINK "https://www.python.org/downloads/"}}{\fldrslt https://www.python.org/downloads/}}.\
55-
56-
\f1\b \ul \
57-
Python 3 and Python 2 Co-existence\
58-
59-
\f0\b0 \ulnone \
60-
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,
61-
\f3 python3
62-
\f0 (or
63-
\f3 python$VERSION
64-
\f0 ),
65-
\f3 idle3
66-
\f0 (or i
67-
\f3 dle$VERSION
68-
\f0 ),
69-
\f3 pip3
70-
\f0 (or
71-
\f3 pip$VERSION
72-
\f0 ), etc. Python 2.7 command names contain a 2 or no digit:
73-
\f3 python2
74-
\f0 (or
75-
\f3 python2.7
76-
\f0 or
77-
\f3 python
78-
\f0 ),
79-
\f3 idle2
80-
\f0 (or
81-
\f3 idle2.7
82-
\f0 or
83-
\f3 idle
84-
\f0 ), etc.\
8567
}

‎Mac/BuildScript/resources/Welcome.rtf

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
1+
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
22
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
33
}
44
{\colortbl;\red255\green255\blue255;}
@@ -14,15 +14,17 @@
1414
\
1515

1616
\f1\b Python for macOS
17-
\f0\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
17+
\f0\b0 consists of the {\field{\*\fldinst{HYPERLINK "https://www.python.org"}}{\fldrslt Python}} programming language interpreter and its batteries-included standard library to allow easy access to macOS features. It also includes the Python integrated development environment,
1818
\f1\b IDLE
19-
\f0\b0 .\
19+
\f0\b0 . You can also use the included
20+
\f1\b pip
21+
\f0\b0 to download and install third-party packages from the {\field{\*\fldinst{HYPERLINK "https://pypi.org"}}{\fldrslt Python Package Index}}. \
2022
\
2123
At the end of this install, click on
2224
\f2 Install Certificates
23-
\f0 for SSL root certificates\
25+
\f0 to install a set of current SSL root certificates.\
2426
\
2527

2628
\f1\b NOTE:
27-
\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8. It is not intended for production use.\
29+
\f0\b0 This is an alpha test preview of Python 3.9.0, the next feature release of Python 3. It is not intended for production use.\
2830
}

0 commit comments

Comments
 (0)
Please sign in to comment.