Benjamin Peterson
d7483993fe
merge 3.4
2014-03-17 16:20:50 -05:00
Benjamin Peterson
2a6053468e
move SharedKeyTests to test_descr
2014-03-17 16:20:12 -05:00
Benjamin Peterson
e380e0986b
merge 3.4
2014-03-17 16:00:27 -05:00
Zachary Ware
6373ba5199
Bump Windows build to 3.5
2014-03-17 15:57:38 -05:00
Benjamin Peterson
df813791db
correct the fix for #20637 ; allow slot descriptor inheritance to take place before creating cached keys
2014-03-17 15:57:17 -05:00
Éric Araujo
42867c73c9
Merge 3.4
2014-03-17 16:50:35 -04:00
Éric Araujo
0b1be1a3b1
Fix typo in example ( #20963 )
2014-03-17 16:48:13 -04:00
Jesus Cea
d890dc1690
MERGE: Typo
2014-03-17 19:23:14 +01:00
Jesus Cea
28a965ff71
Typo
2014-03-17 19:22:59 +01:00
Jesus Cea
5d1cc7e0af
MERGE: Typo
2014-03-17 19:13:27 +01:00
Jesus Cea
bdb8bb39dd
Typo
2014-03-17 19:13:09 +01:00
Jesus Cea
f6f3c4588a
MERGE: Typo
2014-03-17 19:01:11 +01:00
Jesus Cea
cec25b01ec
Typo
2014-03-17 19:00:48 +01:00
Antoine Pitrou
809383ea0d
Remove stray semicolon
2014-03-17 18:23:14 +01:00
Antoine Pitrou
1095907624
Remove stray semicolon
2014-03-17 18:22:41 +01:00
R David Murray
c833f7ea0f
Merge fix for #20960
2014-03-17 11:23:07 -04:00
R David Murray
f93d3dfc50
closes #20960
2014-03-17 11:20:29 -04:00
Georg Brandl
3a748ca982
merge with 3.4
2014-03-17 07:36:59 +01:00
Georg Brandl
a7f48019d5
merge with 3.3
2014-03-17 07:36:51 +01:00
Georg Brandl
56d3a03f70
Update doc version switcher for 3.4/3.5.
2014-03-17 07:36:45 +01:00
Larry Hastings
f5002bd6ac
Version bump to 3.5, step 2.
2014-03-16 23:05:59 -07:00
Larry Hastings
d922dc4700
Version bump to 3.5, step 1.
2014-03-16 23:02:45 -07:00
Larry Hastings
8dc931037b
Merge from 3.4 into default.
2014-03-16 23:01:31 -07:00
Larry Hastings
3c5c56f3c0
Merged default into 3.4 branch. 3.4 branch is now effectively 3.4.1rc1.
2014-03-16 22:54:05 -07:00
Larry Hastings
e41b73caca
Post-release verion bump for 3.4.0(+).
2014-03-16 20:13:07 -07:00
Benjamin Peterson
2221f666eb
merge 3.3 ( #11448 )
2014-03-16 15:56:24 -05:00
Benjamin Peterson
a48d9eaa5c
improve set_tunnel docs ( closes #11448 )
...
Patch by Ryan Kelly, karl, and Nikolaus Rath.
2014-03-16 15:55:39 -05:00
Victor Stinner
7bdf786e74
Issue #20950 : Fix typo asyncio doc, wait() has no self parameter
...
self parameter is implicit. Mention also that communicate() and wait() are
coroutines.
2014-03-16 21:29:31 +01:00
Benjamin Peterson
fca286601b
merge 3.3 ( #20946 )
2014-03-16 11:30:54 -05:00
Benjamin Peterson
fda33559dc
fix ctypes test alignment assumptions ( closes #20946 )
...
Patch by Andreas Schwab.
2014-03-16 10:07:26 +01:00
Larry Hastings
84b1e7168c
Added tag v3.4.0 for changeset 04f714765c13
2014-03-15 22:43:24 -07:00
Larry Hastings
3101b70762
Final documentation fixes for 3.4.0 final.
2014-03-15 22:43:17 -07:00
Larry Hastings
cf1a3cd2c7
Release bump for 3.4.0 final.
2014-03-15 22:34:24 -07:00
Larry Hastings
0548f5c514
Regenerate pydoc_topics, fix markup errors, in preparation for 3.4.0 final.
2014-03-15 22:29:19 -07:00
Larry Hastings
3732ed2414
Merge in all documentation changes since branching 3.4.0rc1.
2014-03-15 21:13:56 -07:00
Nick Coghlan
ffa1f27950
Bring PEP 453 What's New entry up to date
...
We changed a few details of the pip integration over the course
of the Python 3.4 beta and release candidate cycle, but I hadn't
updated the What's New entry appropriately.
The Py2/Py3 split on POSIX and the generally challenges of
dealing with parallel installs means we haven't attained
complete consistency across all environments, but hopefully
this updated text is clearer about the end result.
Relevant to issue #20909 .
2014-03-16 13:55:19 +10:00
R David Murray
01f2129249
whatsnew: Fix Features section title, use title/sentence case consistently.
...
closes #20931
2014-03-15 23:27:30 -04:00
Larry Hastings
34784e6bf7
Issue #20931 : Fix other confusingly-worded heading.
2014-03-15 20:15:55 -07:00
Antoine Pitrou
8bc7ef63a4
Close #16665 : improve documentation for hex(). Patch by Jessica McKellar.
2014-03-16 02:13:07 +01:00
R David Murray
d5358b94d1
whatsnew: Clarify heading.
2014-03-15 21:15:18 -04:00
Antoine Pitrou
790bf0db77
Close #16665 : improve documentation for hex(). Patch by Jessica McKellar.
2014-03-16 02:12:20 +01:00
Benjamin Peterson
bbd392e9e2
merge 3.3
2014-03-15 15:24:10 -05:00
Benjamin Peterson
0392271073
send people to the right editors page ( #20938 )
2014-03-15 15:23:32 -05:00
Ned Deily
b6b6a6d587
Issue #20939 : merge from 3.3
2014-03-15 13:19:20 -07:00
Ned Deily
7e7fb0374a
Issue #20939 : merge from 3.3
2014-03-15 13:19:20 -07:00
Ned Deily
b454742c64
Issue #20939 : Fix test_geturl failure in test_urllibnet due to
...
new redirect of http://www.python.org/ to https://www.python.org .
2014-03-15 13:15:31 -07:00
Benjamin Peterson
8a553f5be4
merge 3.3
2014-03-15 12:29:21 -05:00
Benjamin Peterson
51281736d9
remove runtime_library_dirs for _sqlite; it isn't needed
2014-03-15 12:29:04 -05:00
Benjamin Peterson
af9049ebbc
merge 3.3
2014-03-15 12:21:47 -05:00
Benjamin Peterson
4a42cd48d5
avoid referencing past the bounds of an array
2014-03-15 12:21:28 -05:00