90911 Commits

Author SHA1 Message Date
Benjamin Peterson
902adbb393 merge 3.5 (#24963) 2015-08-30 14:42:59 -07:00
Benjamin Peterson
1498461a7a merge 3.4 (#24963) 2015-08-30 14:42:49 -07:00
Benjamin Peterson
0612ffe8c8 fix spelling that was a bit confused (closes #24963) 2015-08-30 14:42:38 -07:00
Raymond Hettinger
7f9f27d767 merge 2015-08-30 09:17:02 -07:00
Raymond Hettinger
9157545c11 merge 2015-08-30 09:15:36 -07:00
Raymond Hettinger
7a3602e7cf Issue #24931: Resolve __dict__ conflict in namedtuple subclasses. 2015-08-30 09:13:48 -07:00
Zachary Ware
46c9c0d61c Issue #24272: Merge with 3.5 2015-08-29 22:40:37 -05:00
Zachary Ware
ce50802679 Issue #24272: Remove usage of default reST role from typing docs 2015-08-29 22:39:47 -05:00
Zachary Ware
e2f2554d5e Closes #24962: Merge with 3.5 2015-08-29 22:27:12 -05:00
Zachary Ware
072d432f3c Issue #24962: Merge 3.4 2015-08-29 22:26:54 -05:00
Zachary Ware
1a83746418 Issue #24962: Remove space from filename 2015-08-29 22:25:04 -05:00
Donald Stufft
ad406c1b65 Null Merge from 3.5 to default 2015-08-29 18:01:01 -04:00
Donald Stufft
3ed9bf85a6 Null Merge from 3.5.0 to 3.5.1 2015-08-29 18:00:26 -04:00
Donald Stufft
c332e0946a Update setuptools to 18.2 and pip to 7.1.2 2015-08-29 13:57:46 -04:00
Zachary Ware
95c0646547 Closes #24953: Merge with 3.5 2015-08-29 00:13:14 -05:00
Zachary Ware
7503ca7b16 Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows 2015-08-28 23:52:31 -05:00
Alexander Belopolsky
357cb986b2 Fixed typos in TZ format description 2015-08-28 16:56:45 -04:00
Serhiy Storchaka
ccb31673a6 Issue #24881: Fixed setting binary mode in Python implementation of FileIO
on Windows and Cygwin.  Patch from Akira Li.
2015-08-28 22:20:29 +03:00
Serhiy Storchaka
f0f55a00b7 Issue #24881: Fixed setting binary mode in Python implementation of FileIO
on Windows and Cygwin.  Patch from Akira Li.
2015-08-28 22:17:04 +03:00
Robert Collins
fd10a767a2 Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
Patch from Berker Peksag.
2015-08-28 10:36:01 +12:00
Robert Collins
079fc7faff Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
Patch from Berker Peksag.
2015-08-28 10:35:14 +12:00
Robert Collins
ed599b7c84 Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
Patch from Berker Peksag.
2015-08-28 10:34:51 +12:00
Zachary Ware
a51ffd3099 Closes #24947: Merge with 3.5 2015-08-27 15:55:48 -05:00
Zachary Ware
dcc47c6064 Issue #24947: Merge 3.4 2015-08-27 15:55:24 -05:00
Zachary Ware
5e580da0b6 Issue #24947: Fix grammar in asyncio doc
Patch by tagatac
2015-08-27 15:54:39 -05:00
Terry Jan Reedy
54f0e19766 Merge with 3.5 2015-08-27 13:02:47 -04:00
Terry Jan Reedy
73c2194d07 Merge with 3.4 2015-08-27 13:02:27 -04:00
Terry Jan Reedy
8e9296702a Issue #24790: correct typo noticed by Eric Smith 2015-08-27 13:02:11 -04:00
Terry Jan Reedy
ae6a75617f Merge with 3.5 2015-08-26 23:37:47 -04:00
Terry Jan Reedy
eb3849c394 Merge with 3.4 2015-08-26 23:37:31 -04:00
Terry Jan Reedy
2050a1061f Issue #24790: Restore unused function. 2015-08-26 23:37:14 -04:00
Terry Jan Reedy
f6f5dbfb1f Merge with 3.5 2015-08-26 23:14:26 -04:00
Terry Jan Reedy
2ceb55fbea Merge with 3.4 2015-08-26 23:13:43 -04:00
Terry Jan Reedy
41a27e021e Issue #24782: In Idle extension config dialog, replace tabs with sorted list.
Patch by Mark Roseman.
2015-08-26 23:13:22 -04:00
Eric V. Smith
ab2aa6dc91 Fixed an incorrect comment. 2015-08-26 14:10:32 -04:00
Yury Selivanov
7f344a89ef Merge 3.5 2015-08-26 13:04:06 -04:00
Yury Selivanov
beaa5094a2 docs: Better comment for tp_as_async slot 2015-08-26 13:03:57 -04:00
Raymond Hettinger
7a1a0bbbf1 merge 2015-08-26 08:09:50 -07:00
Raymond Hettinger
87674ec7d5 Issue #24913: Fix overrun error in deque.index(). 2015-08-26 08:08:38 -07:00
Robert Collins
69de2a576c Issue #23552: Timeit now warns when there is substantial (4x) variance
between best and worst times. Patch from Serhiy Storchaka.
2015-08-26 12:40:28 +12:00
Larry Hastings
5eac15336a Merge. 2015-08-25 17:21:54 -07:00
Larry Hastings
9783e443bc Misc/NEWS needs a Python 3.5.0rc3 section in 3.5 and trunk. 2015-08-25 17:21:22 -07:00
Larry Hastings
45d1c00831 Merge from 3.5 (with 3.5.0rc2 changes) into default (3.6). Messy! 2015-08-25 14:21:59 -07:00
Larry Hastings
06a7d611da Merge from Python 3.5.0 (rc2) to Python 3.5.1. 2015-08-25 14:13:55 -07:00
Larry Hastings
9126d5499e Added missing #-marks to Misc/NEWS lines. 2015-08-25 14:08:21 -07:00
Larry Hastings
abcf3a128e Added missing IDLE updates to Misc/NEWS that shipped with Python 3.5.0rc1. 2015-08-25 13:51:14 -07:00
Larry Hastings
b96646684e Move misplaced Misc/NEWS item from 3.5.0rc1 to 3.5.0rc2. 2015-08-25 13:41:35 -07:00
Larry Hastings
cd9b2123f6 Add missing Misc/NEWS item for merged pull request for issue #24867. 2015-08-25 13:37:23 -07:00
Larry Hastings
a51812ae98 Post-release updates for Python 3.5.0rc2. 2015-08-25 13:30:58 -07:00
Martin Panter
ccf426e7e7 Issue #24808: Merge 3.5 into 3.6 2015-08-25 05:41:51 +00:00