traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2015-07-04 22:52:33 -05:00
parent 2a48a6eb33 f1ce6deb41
commit 1da0612e70
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/idle.rst
View File

@ -248,7 +248,8 @@ Configure IDLE
help sources can be specified. Non-default user setting are saved in a
.idlerc directory in the user's home directory. Problems caused by bad user
configuration files are solved by editing or deleting one or more of the
files in .idlerc.
files in .idlerc. On OS X, open the configuration dialog by selecting
Preferences in the application menu.
Configure Extensions
Open a configuration dialog for setting preferences for extensions

2
Doc/library/unittest.rst
View File

@ -47,7 +47,7 @@ test runner
Module :mod:`doctest`
Another test-support module with a very different flavor.
`Simple Smalltalk Testing: With Patterns <http://www.XProgramming.com/testfram.htm>`_
`Simple Smalltalk Testing: With Patterns <https://web.archive.org/web/20150315073817/http://www.xprogramming.com/testfram.htm>`_
Kent Beck's original paper on testing frameworks using the pattern shared
by :mod:`unittest`.

4
Lib/idlelib/help.txt
View File

@ -129,7 +129,9 @@ Options Menu (Shell and Editor):
Configure IDLE -- Open a configuration dialog. Fonts, indentation,
keybindings, and color themes may be altered.
Startup Preferences may be set, and additional Help
sources can be specified.
sources can be specified. On OS X, open the
configuration dialog by selecting Preferences
in the application menu.
---
Code Context (toggle) -- Open a pane at the top of the edit window

6
Mac/BuildScript/build-installer.py
View File

@ -237,9 +237,9 @@ def library_recipes():
result.extend([
dict(
name="OpenSSL 1.0.2a",
url="https://www.openssl.org/source/openssl-1.0.2a.tar.gz",
checksum='a06c547dac9044161a477211049f60ef',
name="OpenSSL 1.0.2c",
url="https://www.openssl.org/source/openssl-1.0.2c.tar.gz",
checksum='8c8d81a9ae7005276e486702edbcd4b6',
patches=[
"openssl_sdk_makedepend.patch",
],

2
Mac/BuildScript/openssl_sdk_makedepend.patch
View File

@ -2,7 +2,7 @@
# Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
# openssl_sdk_makedepend.patch
#
# using openssl 1.0.2a
# using openssl 1.0.2c
#
# - support building with an OS X SDK
# - allow "make depend" to use compilers with names other than "gcc"

4
Misc/NEWS
View File

@ -342,8 +342,8 @@ Build
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster.
- Issue #23686: Update OS X 10.5 installer and Windows builds to use
OpenSSL 1.0.2a.
- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
1.0.2c.
C API
-----

2
PCbuild/get_externals.bat
View File

@ -54,7 +54,7 @@ echo.Fetching external libraries...
for %%e in (
bzip2-1.0.6
nasm-2.11.06
openssl-1.0.2a
openssl-1.0.2c
tcl-8.6.1.0
tk-8.6.1.0
tix-8.4.3.4

2
PCbuild/pyproject.props
View File

@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
<opensslDir>$(externalsDir)\openssl-1.0.2a</opensslDir>
<opensslDir>$(externalsDir)\openssl-1.0.2c</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>

2
PCbuild/readme.txt
View File

@ -171,7 +171,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
Python wrapper for version 1.0.2a of the OpenSSL secure sockets
Python wrapper for version 1.0.2c of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/