Commit Graph

86994 Commits

Author SHA1 Message Date
Benjamin Peterson 8c06ac5e58 merge 3.4 2014-10-19 10:48:06 -04:00
Benjamin Peterson 0fc08fd2c7 merge 3.3 2014-10-19 10:47:58 -04:00
Benjamin Peterson 9fc59c9fc2 make plural s lowercase 2014-10-19 10:47:49 -04:00
Georg Brandl 6e868b7bef merge with 3.4 2014-10-19 11:55:15 +02:00
Georg Brandl 24f0717b82 Closes #22663: patchcheck: only modify text files under Doc/ 2014-10-19 11:54:08 +02:00
Ethan Furman 61358f4622 Issue20689: add missing API pieces to __all__ 2014-10-18 15:11:03 -07:00
Ethan Furman 8e120ac05c Issue20689: add missing API pieces to __all__ 2014-10-18 15:10:49 -07:00
Terry Jan Reedy 36d99dcf2b Merge with 3.4 2014-10-18 17:10:32 -04:00
Terry Jan Reedy dd09efdd53 Issue #20155: Fix non-buildbot test failure on Windows. Patch by Claudiu Popa,
revised by R. David Murray.
2014-10-18 17:10:09 -04:00
Ethan Furman 58b2ddf392 Issue7186: document that __doc__ is not inherited by subclasses 2014-10-17 22:25:47 -07:00
Ethan Furman f87f515057 Issue7186: document that __doc__ is not inherited by subclasses 2014-10-17 22:25:22 -07:00
Robert Collins 933430ab69 Issue #17401: document closefd in io.FileIO docs and add to repr
closefd was documented in the open docs but not the matching FileIO
class documented. Further, closefd, part of the core state for the
object was not shown.

In review it was noted that the open docs are a little confusing about
the interaction between closefd and paths, so tweaked them at the same
time.
2014-10-18 13:32:43 +13:00
R David Murray d20ec1b921 Merge: #18853: Fix resource warning in shlex's __main__ section. 2014-10-17 20:30:16 -04:00
R David Murray 838f2c437d #18853: Fix resource warning in shlex's __main__ section.
Report and original fix by Vajrasky Kok.
2014-10-17 20:28:47 -04:00
R David Murray afce02ed38 Merge: #9351: set_defaults on subparser is no longer ignored if set on parent. 2014-10-17 19:58:03 -04:00
R David Murray 7570cbdc6b #9351: set_defaults on subparser is no longer ignored if set on parent.
Before, if a default was set on the parent parser, any default for that
variable set via set_defaults on a subparser would be ignored.  Now
the subparser set_defaults is honored.

Patch by Jyrki Pullianinen.
2014-10-17 19:55:11 -04:00
R David Murray d2ff243b38 Merge: #21991: make headerregistry params property MappingProxyType. 2014-10-17 19:32:08 -04:00
R David Murray 685b3495e1 #21991: make headerregistry params property MappingProxyType.
It is unlikely anyone is using the fact that the dictionary returned
by the 'params' attribute was previously writable, but even if someone
is the API is provisional so this kind of change is acceptable (and
needed, to get the API "right" before it becomes official).

Patch by Stéphane Wirtel.
2014-10-17 19:30:13 -04:00
Zachary Ware 77770bdaa8 Turn externals cleaning back off 2014-10-17 17:40:04 -05:00
Antoine Pitrou bc92bbd4d2 Issue #22653: Fix an assertion failure in debug mode when doing a reentrant dict insertion in debug mode. 2014-10-18 00:35:44 +02:00
Antoine Pitrou d696732025 Issue #22653: Fix an assertion failure in debug mode when doing a reentrant dict insertion in debug mode. 2014-10-18 00:35:00 +02:00
Zachary Ware 4dc7278546 Issue #22644: Update the Windows build to OpenSSL 1.0.1j 2014-10-17 16:31:57 -05:00
Zachary Ware baa6d3a01f Issue #22644: Update the Windows build to OpenSSL 1.0.1j 2014-10-17 16:26:30 -05:00
Zachary Ware f88cad0087 Merge with 3.4 2014-10-17 14:24:43 -05:00
Zachary Ware be16d68071 Fix test_ctypes failure on OpenIndiana buildbot where _ctypes is not built 2014-10-17 14:24:14 -05:00
Zachary Ware 459c36490f Issue #16000: Convert test_curses to use unittest 2014-10-17 14:10:51 -05:00
Zachary Ware baf45c590c Issue #16000: Convert test_curses to use unittest 2014-10-17 13:59:18 -05:00
Antoine Pitrou e4eda4d33f Issue #22638: SSLv3 is now disabled throughout the standard library.
It can still be enabled by instantiating a SSLContext manually.
2014-10-17 19:28:30 +02:00
Vinay Sajip c2c62b13ce Closes #22646: Accept list as well as tuple to support initialisation via dictConfig(). 2014-10-17 08:52:20 +01:00
Vinay Sajip 16c41ab460 Issue #22646: Accept list as well as tuple to support initialisation via dictConfig(). 2014-10-17 08:49:38 +01:00
Terry Jan Reedy 353474fc71 Merge with 3.4: Issue #22629 2014-10-17 01:32:20 -04:00
Terry Jan Reedy cd567365c9 Issue #22629: Revise idle_test.htest, mostly docstring. Start revision of
htests to add # htest # marker for coveragepy and stop tcl errors.
2014-10-17 01:31:35 -04:00
Terry Jan Reedy ba2f07df09 Merge with 3.4 Issue #22628 2014-10-16 23:13:21 -04:00
Terry Jan Reedy 9a6f8e1866 Issue #22628: Increase Treewidge line spacing so lines do not overlap.
Move test lines up with respect to icons.
2014-10-16 23:12:48 -04:00
Benjamin Peterson 52f2ae8d33 merge 3.4 2014-10-15 23:58:37 -04:00
Benjamin Peterson fa5021699a Merge 3.3 2014-10-15 23:58:32 -04:00
Terry Jan Reedy 6b541de73d Merge with 3.4 Issue#16233 2014-10-15 22:01:58 -04:00
Terry Jan Reedy 380ec63f23 Issue #16233: When the module browser is not invoked in an editor window with
a filename, pop up the Open Module box. If a module is opened, open a
corresponding browser.
2014-10-15 22:01:31 -04:00
Antoine Pitrou b6dc9b7554 Fixed signed/unsigned comparison warning 2014-10-15 23:14:53 +02:00
Antoine Pitrou 4e334241b7 Fixed signed/unsigned comparison warning 2014-10-15 23:14:53 +02:00
Benjamin Peterson ea1f665197 Merge heads 2014-10-15 13:40:53 -04:00
Benjamin Peterson 20521cd039 merge 3.4 2014-10-15 13:40:46 -04:00
Benjamin Peterson c966103be6 merge heads 2014-10-15 13:40:34 -04:00
Benjamin Peterson dc8899f0e2 merge 3.4 (#22643) 2014-10-15 13:40:15 -04:00
Benjamin Peterson 3f9f612b7d merge 3.3 (#22643) 2014-10-15 13:40:01 -04:00
Benjamin Peterson 4d856895bd test is cpython only 2014-10-15 13:39:46 -04:00
Victor Stinner 4ed3c65e5e Merge 3.4 (asyncio doc) 2014-10-15 18:49:32 +02:00
Victor Stinner 7f314ed71b asyncio doc: write simpler examples to introduce asyncio 2014-10-15 18:49:16 +02:00
Benjamin Peterson 736982d36d merge 3.4 (closes #22643) 2014-10-15 12:17:47 -04:00
Benjamin Peterson 9c422f3c3d merge 3.3 2014-10-15 12:17:33 -04:00