Commit graph

90099 commits

Author SHA1 Message Date
Zachary Ware
f149ae410b Merge 3.5 2015-07-07 00:08:50 -05:00
Zachary Ware
3d3aedc8ba Fix usage of the default role. 2015-07-07 00:07:25 -05:00
Zachary Ware
4ffc3d4480 Merge 3.4 2015-07-07 00:00:43 -05:00
Zachary Ware
e36402a830 Fix usage of the default role.
The changes to Doc/library/unittest.mock.rst are almost entirely a
selective backport of the 3.5 page.
2015-07-06 23:58:12 -05:00
Zachary Ware
6b42059c60 Merge 3.5 2015-07-06 23:33:33 -05:00
Zachary Ware
1a7df86c46 Merge 3.4 2015-07-06 23:30:16 -05:00
Zachary Ware
5c676f67d1 Fix suspicious markup 2015-07-06 23:27:15 -05:00
Raymond Hettinger
11ce8e6c37 Minor bit of factoring-out common code. 2015-07-06 19:08:49 -07:00
Raymond Hettinger
3dbc11cadd Tighten-up code in the set iterator to use an entry pointer rather than indexing. 2015-07-06 19:03:01 -07:00
Serhiy Storchaka
6d7cfadc6b Corrected empty lines in Misc/NEWS. 2015-07-06 20:04:21 +03:00
Serhiy Storchaka
958b3cc8c7 Corrected empty lines in Misc/NEWS. 2015-07-06 20:02:50 +03:00
Serhiy Storchaka
ebbdb7d3d7 Corrected empty lines in Misc/NEWS. 2015-07-06 19:58:11 +03:00
Benjamin Peterson
809868ab63 merge 3.5 2015-07-06 11:28:47 -05:00
Benjamin Peterson
2dd6e477df merge 3.4 2015-07-06 11:28:40 -05:00
Benjamin Peterson
7dcbf900ac 'not' is very important here 2015-07-06 11:28:07 -05:00
Raymond Hettinger
ef6bd7d963 Tighten-up code in set_next() to use an entry pointer rather than indexing. 2015-07-06 08:43:37 -07:00
Benjamin Peterson
df48b8571e merge 3.5 2015-07-06 09:41:20 -05:00
Benjamin Peterson
c0a446a7d9 merge 3.4 2015-07-06 09:41:07 -05:00
Benjamin Peterson
b8fd26256e tighten warning 2015-07-06 09:40:43 -05:00
Serhiy Storchaka
5bccb29de5 Issue #18684: Fixed reading out of the buffer in the re module. 2015-07-06 14:23:04 +03:00
Serhiy Storchaka
02eae6b1f2 Issue #18684: Fixed reading out of the buffer in the re module. 2015-07-06 14:03:01 +03:00
Serhiy Storchaka
03d6ee3823 Issue #18684: Fixed reading out of the buffer in the re module. 2015-07-06 13:58:33 +03:00
Lars Gustäbel
7afe40e40e Merge with 3.5: Issue #24259: tarfile now raises a ReadError if an archive is truncated inside a data segment. 2015-07-06 09:32:05 +02:00
Lars Gustäbel
e12aa62d68 Merge with 3.4: Issue #24259: tarfile now raises a ReadError if an archive is truncated inside a data segment. 2015-07-06 09:29:41 +02:00
Lars Gustäbel
0357268d96 Issue #24259: tarfile now raises a ReadError if an archive is truncated inside a data segment. 2015-07-06 09:27:24 +02:00
Raymond Hettinger
b48d6a63ff Bring related functions add/contains/discard together in the code. 2015-07-05 16:27:44 -07:00
Raymond Hettinger
73799b181e Change add/contains/discard calls to pass the key and hash instead of an entry struct. 2015-07-05 16:06:10 -07:00
Ned Deily
14806c4b86 Issue #24540: merger from 3.5 2015-07-05 11:46:12 -07:00
Ned Deily
53ecc58bd9 Issue #24540: merger from 3.4 2015-07-05 11:45:31 -07:00
Ned Deily
54630d999f Issue #24540: fix typo in json.dumps docstring 2015-07-05 11:45:01 -07:00
Ned Deily
da2d51f97a merge 3.5.0b3 changes from 3.5 2015-07-05 11:17:43 -07:00
Larry Hastings
ab30353adb Merge with ongoing work in 3.5 branch. 2015-07-05 10:31:09 -07:00
Larry Hastings
b34db6ad9b Post-release fixes for Python 3.5.0b3. 2015-07-05 10:26:00 -07:00
Raymond Hettinger
dc28d5a198 Clean-up call patterns for add/contains/discard to better match the caller's needs. 2015-07-05 10:03:20 -07:00
Benjamin Peterson
fdf660a866 merge 3.5 2015-07-05 10:39:22 -05:00
Benjamin Peterson
1ef57194b3 merge heads 2015-07-05 10:39:18 -05:00
Benjamin Peterson
95f9dd5e72 merge heads 2015-07-05 10:39:13 -05:00
Benjamin Peterson
9f71cb0fee merge 3.5 (#24569) 2015-07-05 10:38:05 -05:00
Benjamin Peterson
d5d77aac60 set items in dict displays from left to right (closes #24569) 2015-07-05 10:37:25 -05:00
Benjamin Peterson
1554b17856 add news section for next beta 2015-07-05 10:37:00 -05:00
Steve Dower
32f64d03e4 Fixes rebuild of strings for Windows installer. 2015-07-05 07:24:47 -07:00
Steve Dower
d423396394 Fixes rebuild of strings for Windows installer. 2015-07-05 07:24:17 -07:00
Benjamin Peterson
3e7f3c032f merge 3.5 2015-07-04 22:53:55 -05:00
Benjamin Peterson
191a8f0a34 merge heads 2015-07-04 22:53:45 -05:00
Benjamin Peterson
a111271ba7 merge 3.4 2015-07-04 22:53:37 -05:00
Benjamin Peterson
63eaf7b73d merge heads 2015-07-04 22:53:11 -05:00
Benjamin Peterson
1da0612e70 merge heads 2015-07-04 22:52:33 -05:00
Larry Hastings
0417f55ed4 Added tag v3.5.0b3 for changeset 0035fcd9b924 2015-07-04 19:13:23 -07:00
Larry Hastings
9626971c74 Version bump for Python 3.5.0b3 release. 2015-07-04 19:13:02 -07:00
Larry Hastings
aaa377f01d Documentation fixes for 3.5.0b3. 2015-07-04 19:11:41 -07:00