Commit Graph

92726 Commits

Author SHA1 Message Date
Ezio Melotti d4d4f20284 #25991: merge with 3.5. 2016-01-11 23:31:38 +02:00
Ezio Melotti 7c018aa377 #25991: fix readline example to limit history size. Patch by Daniel Dye. 2016-01-11 23:30:56 +02:00
Barry Warsaw 305e3557e9 Merge heads. 2016-01-11 15:53:51 -05:00
Barry Warsaw e973620472 Merge heads. 2016-01-11 15:53:19 -05:00
Barry Warsaw 3d220cc4d7 As per further discussion, re-enable the typeobject.c guard for picklability.
upstreams such as Cython will have to adjust.
2016-01-11 15:51:27 -05:00
doko@ubuntu.com 0633cb7d7a Merge 3.5 2016-01-11 21:43:29 +01:00
doko@ubuntu.com b2b1217270 - Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars
appearing before $() vars.
2016-01-11 21:41:40 +01:00
Yury Selivanov 37dc2b2883 Issue #25486: Resurrect inspect.getargspec in 3.6. Backout a565aad5d6e1.
The decision is that we shouldn't remove popular APIs (however long they
are depreacted) from Python 3, while 2.7 is still around and supported.
2016-01-11 15:15:01 -05:00
Barry Warsaw 09880c89e9 Comment out some tests that won't pass now that we've reverted the
picklability regression.  Also, as per further discussion, remove the
regressing code.
2016-01-11 15:14:53 -05:00
Barry Warsaw ec71f1779f Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
_PyObject_GetState() due to regressions observed in Cython-based projects.
2016-01-11 13:49:40 -05:00
Barry Warsaw 885e1939be Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
_PyObject_GetState() due to regressions observed in Cython-based projects.
2016-01-11 13:24:02 -05:00
Yury Selivanov 4f8273d77e Merge 3.5 (issue #26050) 2016-01-11 12:32:53 -05:00
Yury Selivanov b4b8a0ef3e Merge 3.4 (Issue #26050) 2016-01-11 12:30:56 -05:00
Yury Selivanov d9d0e864b9 Issue #26050: Add asyncio.StreamReader.readuntil() method.
Patch by Марк Коренберг.
2016-01-11 12:28:19 -05:00
Senthil Kumaran 96b531abd5 Issue #26069: Remove the deprecated apis in the trace module. 2016-01-11 07:09:42 -08:00
Andrew Svetlov f7272a667e merge 3.5 2016-01-11 15:42:05 +02:00
Andrew Svetlov ea471348f4 Fix versionadded to use 3.5.1 only for 3.5 branch 2016-01-11 15:41:43 +02:00
Andrew Svetlov 38bb42c132 merge 3.5 2016-01-11 14:45:49 +02:00
Andrew Svetlov 3af81f2505 merge 3.4 2016-01-11 14:45:25 +02:00
Andrew Svetlov f1240169b3 Document asyncio.timeout() 2016-01-11 14:40:35 +02:00
Andrew Svetlov 511bf7880c merge 3.5 2016-01-11 12:26:02 +02:00
Andrew Svetlov 4ea31f5b86 merge 3.4 2016-01-11 12:25:40 +02:00
Andrew Svetlov 9d976fa75f Sync with asyncio 2016-01-11 12:25:23 +02:00
Andrew Svetlov 97558412ce merge 3.5 2016-01-11 09:21:02 +02:00
Andrew Svetlov 3feb9460ed Add missing Misc/NEWS update 2016-01-11 09:16:58 +02:00
Andrew Svetlov 34dd59ec84 merge 3.5 2016-01-11 09:13:10 +02:00
Andrew Svetlov b86abb79aa merge 3.4 2016-01-11 09:09:10 +02:00
Andrew Svetlov c07b16b40f Sync with asyncio repo 2016-01-11 08:42:49 +02:00
Mark Hammond 32d1e56bda Issue #26070: py.exe launcher fails to find in-place built binaries from earlier Python versions. 2016-01-11 14:53:01 +11:00
Mark Hammond ce543fd795 Issue #26070: py.exe launcher fails to find in-place built binaries from earlier Python versions. 2016-01-11 14:50:22 +11:00
Benjamin Peterson 7e23fe1ce1 merge 3.5 (#26066) 2016-01-09 23:56:40 -08:00
Benjamin Peterson 4d927420b8 merge 3.4 (#26066) 2016-01-09 23:56:31 -08:00
Benjamin Peterson 6829dbbf3f delete old crypto prose (closes #26066) 2016-01-09 23:55:47 -08:00
Senthil Kumaran 656a8415aa merge from 3.5
Issue23675 - A tiny clarification in the MRO glossary term.
2016-01-09 22:34:40 -08:00
Senthil Kumaran 3858a1c18c Issue23675 - A tiny clarification in the MRO glossary term. 2016-01-09 22:33:54 -08:00
Terry Jan Reedy c0a732e901 Merge with 3.5 2016-01-09 12:22:13 -05:00
Terry Jan Reedy 6401e79520 Issue #26029: Finish correction. 2016-01-09 12:22:00 -05:00
Ezio Melotti ef7851b891 #24789: merge with 3.5. 2016-01-09 16:09:19 +02:00
Ezio Melotti ee2a392e6a #24789: fix docstring of ctypes.create_string_buffer. Patch by Matheus Vieira Portela. 2016-01-09 16:08:24 +02:00
Terry Jan Reedy 3acf170869 Merge with 3.5 2016-01-09 03:28:01 -05:00
Terry Jan Reedy 2a97f8a6d1 Issue #26029: Remove extraneous word. Patch by Upendra Kumar. 2016-01-09 03:27:37 -05:00
Senthil Kumaran b94591c2bf merge from 3.5
Issue #22138: Fix mock.patch behavior when patching descriptors. Restore
original values after patching.

Patch contributed by Sean McCully.
2016-01-08 23:44:10 -08:00
Senthil Kumaran 81bc927da7 Issue #22138: Fix mock.patch behavior when patching descriptors. Restore
original values after patching.

Patch contributed by Sean McCully.
2016-01-08 23:43:29 -08:00
Brett Cannon a85e927e39 Issue #25802: Add an examples section to importlib.
Thanks to Berker Peksag for the patch review.
2016-01-08 14:33:09 -08:00
Senthil Kumaran fd65958f4f merge from 3.5
Issue20969 - Set the Epub Author and Epub Publisher in Python docs.
2016-01-08 01:03:03 -08:00
Senthil Kumaran cbe6356c42 Issue20969 - Set the Epub Author and Epub Publisher in Python docs. 2016-01-08 01:01:56 -08:00
Benjamin Peterson 3407473f91 merge 3.5 (#26046) 2016-01-07 22:02:13 -08:00
Benjamin Peterson e95fd0b411 merge 3.4 (#26046) 2016-01-07 22:02:01 -08:00
Benjamin Peterson 8a6ddb98e6 fix typo in unittest docs (closes #26046)
Patch from Upendra Kumar.
2016-01-07 22:01:26 -08:00
Benjamin Peterson 5db60aa84e merge 3.5 (closes #25672) 2016-01-07 21:38:51 -08:00