Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1da0612e
Commit
1da0612e
authored
Jul 04, 2015
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge heads
parents
2a48a6eb
f1ce6deb
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
12 deletions
+15
-12
Doc/library/idle.rst
Doc/library/idle.rst
+2
-1
Doc/library/unittest.rst
Doc/library/unittest.rst
+1
-1
Lib/idlelib/help.txt
Lib/idlelib/help.txt
+3
-1
Mac/BuildScript/build-installer.py
Mac/BuildScript/build-installer.py
+3
-3
Mac/BuildScript/openssl_sdk_makedepend.patch
Mac/BuildScript/openssl_sdk_makedepend.patch
+1
-1
Misc/NEWS
Misc/NEWS
+2
-2
PCbuild/get_externals.bat
PCbuild/get_externals.bat
+1
-1
PCbuild/pyproject.props
PCbuild/pyproject.props
+1
-1
PCbuild/readme.txt
PCbuild/readme.txt
+1
-1
No files found.
Doc/library/idle.rst
View file @
1da0612e
...
@@ -248,7 +248,8 @@ Configure IDLE
...
@@ -248,7 +248,8 @@ Configure IDLE
help sources can be specified. Non-default user setting are saved in a
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
.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
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
Configure Extensions
Open a configuration dialog for setting preferences for extensions
Open a configuration dialog for setting preferences for extensions
...
...
Doc/library/unittest.rst
View file @
1da0612e
...
@@ -47,7 +47,7 @@ test runner
...
@@ -47,7 +47,7 @@ test runner
Module :mod:`doctest`
Module :mod:`doctest`
Another test-support module with a very different flavor.
Another test-support module with a very different flavor.
`Simple Smalltalk Testing: With Patterns <http
://www.XP
rogramming.com/testfram.htm>`_
`Simple Smalltalk Testing: With Patterns <http
s://web.archive.org/web/20150315073817/http://www.xp
rogramming.com/testfram.htm>`_
Kent Beck's original paper on testing frameworks using the pattern shared
Kent Beck's original paper on testing frameworks using the pattern shared
by :mod:`unittest`.
by :mod:`unittest`.
...
...
Lib/idlelib/help.txt
View file @
1da0612e
...
@@ -129,7 +129,9 @@ Options Menu (Shell and Editor):
...
@@ -129,7 +129,9 @@ Options Menu (Shell and Editor):
Configure IDLE -- Open a configuration dialog. Fonts, indentation,
Configure IDLE -- Open a configuration dialog. Fonts, indentation,
keybindings, and color themes may be altered.
keybindings, and color themes may be altered.
Startup Preferences may be set, and additional Help
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
Code Context (toggle) -- Open a pane at the top of the edit window
...
...
Mac/BuildScript/build-installer.py
View file @
1da0612e
...
@@ -237,9 +237,9 @@ def library_recipes():
...
@@ -237,9 +237,9 @@ def library_recipes():
result
.
extend
([
result
.
extend
([
dict
(
dict
(
name
=
"OpenSSL 1.0.2
a
"
,
name
=
"OpenSSL 1.0.2
c
"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
a
.tar.gz"
,
url
=
"https://www.openssl.org/source/openssl-1.0.2
c
.tar.gz"
,
checksum
=
'
a06c547dac9044161a477211049f60ef
'
,
checksum
=
'
8c8d81a9ae7005276e486702edbcd4b6
'
,
patches
=
[
patches
=
[
"openssl_sdk_makedepend.patch"
,
"openssl_sdk_makedepend.patch"
,
],
],
...
...
Mac/BuildScript/openssl_sdk_makedepend.patch
View file @
1da0612e
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
#
Parent 25a9af415e8c3faf591c360d5f0e361d049b2b43
#
openssl_sdk_makedepend.patch
#
openssl_sdk_makedepend.patch
#
#
# using openssl 1.0.2
a
# using openssl 1.0.2
c
#
#
# - support building with an OS X SDK
# - support building with an OS X SDK
#
- allow "make depend" to use compilers with names other than "gcc"
#
- allow "make depend" to use compilers with names other than "gcc"
...
...
Misc/NEWS
View file @
1da0612e
...
@@ -342,8 +342,8 @@ Build
...
@@ -342,8 +342,8 @@ Build
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
- Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
the resulting executable faster.
the resulting executable faster.
- Issue #2
3686: Update OS X 10.5 installer and Windows builds to use
- Issue #2
4432: Update Windows builds and OS X 10.5 installer to use OpenSSL
OpenSSL 1.0.2a
.
1.0.2c
.
C API
C API
-----
-----
...
...
PCbuild/get_externals.bat
View file @
1da0612e
...
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
...
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
for
%%e
in
(
for
%%e
in
(
bzip2
-
1
.0.6
bzip2
-
1
.0.6
nasm
-
2
.11.06
nasm
-
2
.11.06
openssl
-
1
.0.2
a
openssl
-
1
.0.2
c
tcl
-
8
.6.1.0
tcl
-
8
.6.1.0
tk
-
8
.6.1.0
tk
-
8
.6.1.0
tix
-
8
.4.3.4
tix
-
8
.4.3.4
...
...
PCbuild/pyproject.props
View file @
1da0612e
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<sqlite3Dir>
$(externalsDir)\sqlite-3.8.3.1
</sqlite3Dir>
<sqlite3Dir>
$(externalsDir)\sqlite-3.8.3.1
</sqlite3Dir>
<bz2Dir>
$(externalsDir)\bzip2-1.0.6
</bz2Dir>
<bz2Dir>
$(externalsDir)\bzip2-1.0.6
</bz2Dir>
<lzmaDir>
$(externalsDir)\xz-5.0.5
</lzmaDir>
<lzmaDir>
$(externalsDir)\xz-5.0.5
</lzmaDir>
<opensslDir>
$(externalsDir)\openssl-1.0.2
a
</opensslDir>
<opensslDir>
$(externalsDir)\openssl-1.0.2
c
</opensslDir>
<tcltkDir>
$(externalsDir)\tcltk
</tcltkDir>
<tcltkDir>
$(externalsDir)\tcltk
</tcltkDir>
<tcltk64Dir>
$(externalsDir)\tcltk64
</tcltk64Dir>
<tcltk64Dir>
$(externalsDir)\tcltk64
</tcltk64Dir>
<tcltkLib>
$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib
</tcltkLib>
<tcltkLib>
$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib
</tcltkLib>
...
...
PCbuild/readme.txt
View file @
1da0612e
...
@@ -171,7 +171,7 @@ _lzma
...
@@ -171,7 +171,7 @@ _lzma
Homepage:
Homepage:
http://tukaani.org/xz/
http://tukaani.org/xz/
_ssl
_ssl
Python wrapper for version 1.0.2
a
of the OpenSSL secure sockets
Python wrapper for version 1.0.2
c
of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
library, which is built by ssl.vcxproj
Homepage:
Homepage:
http://www.openssl.org/
http://www.openssl.org/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment