Commit graph

97303 commits

Author SHA1 Message Date
Serhiy Storchaka
78c13021db Null merge 2016-09-21 15:57:24 +03:00
Serhiy Storchaka
afc5127d8b Merge heads 2016-09-21 15:57:08 +03:00
Serhiy Storchaka
349f552507 Merge heads 2016-09-21 15:56:57 +03:00
Christian Heimes
33c898ec97 lcov: ignore more 3rd party code and internal test/debug/dummy files 2016-09-21 14:55:50 +02:00
Serhiy Storchaka
cf4fb40b9d Issue #28214: Now __set_name__ is looked up on the class instead of the
instance.
2016-09-21 15:55:49 +03:00
Christian Heimes
79f9d4ff97 lcov: ignore more 3rd party code and internal test/debug/dummy files 2016-09-21 14:55:43 +02:00
Serhiy Storchaka
afd02a439f Issue #28214: Now __set_name__ is looked up on the class instead of the
instance.
2016-09-21 15:54:59 +03:00
Christian Heimes
d55bdb86ca Don't define PY_WITH_KECCAK 2016-09-21 14:37:04 +02:00
Christian Heimes
b00e00c339 Don't define PY_WITH_KECCAK 2016-09-21 14:36:44 +02:00
Victor Stinner
71276144bd Merge 3.6 2016-09-21 14:14:59 +02:00
Victor Stinner
44f4874e68 Merge 3.5 2016-09-21 14:13:53 +02:00
Victor Stinner
1ddf53d496 Fix PyUnicode_FromFormatV() error handling
Issue #28233: Fix a memory leak if the format string contains a non-ASCII
character, destroy the unicode writer.
2016-09-21 14:13:14 +02:00
Christian Heimes
e5ad75e242 va_end() all va_copy()ed va_lists. 2016-09-21 11:37:38 +02:00
Christian Heimes
2f2fee19ec va_end() all va_copy()ed va_lists. 2016-09-21 11:37:27 +02:00
Victor Stinner
c710362576 Merge 3.6 2016-09-21 09:16:39 +02:00
Victor Stinner
1c56bf0bad Merge 3.5 2016-09-21 09:16:31 +02:00
Victor Stinner
0256f42839 test_asynico: fix test_sock_connect_sock_write_race()
Issue #28176: Increase timeout from 10 seconds to 60 seconds.
2016-09-21 09:15:36 +02:00
Benjamin Peterson
637d1e2b0a merge 3.6 2016-09-20 20:39:44 -07:00
Benjamin Peterson
0c21214f3e replace usage of Py_VA_COPY with the (C99) standard va_copy 2016-09-20 20:39:33 -07:00
Victor Stinner
b6f3c0dca1 Merge 3.6 (os.getrandom) 2016-09-20 23:01:22 +02:00
Victor Stinner
ec2319c46d Fix memleak in os.getrandom()
Issue #27778: Fix a memory leak in os.getrandom() when the getrandom() is
interrupted by a signal and a signal handler raises a Python exception.

Modify also os_getrandom_impl() to avoid the temporary buffer, use directly a
Python bytes object.
2016-09-20 23:00:59 +02:00
Victor Stinner
6b405d2f2b Merge 3.6 2016-09-20 22:50:11 +02:00
Victor Stinner
75024c6589 (Merge 3.5) Catch EPERM error in py_getrandom()
Issue #27955: Fallback on reading /dev/urandom device when the getrandom()
syscall fails with EPERM, for example when blocked by SECCOMP.
2016-09-20 22:49:52 +02:00
Victor Stinner
6d8bc46cc0 Catch EPERM error in py_getrandom()
Issue #27955: Fallback on reading /dev/urandom device when the getrandom()
syscall fails with EPERM, for example when blocked by SECCOMP.
2016-09-20 22:46:02 +02:00
Victor Stinner
af59732102 Cleanup random.c
Issue #27955: modify py_getrnadom() and dev_urandom()

* Add comments from Python 3.7
* PEP 7 style: add {...}
2016-09-20 22:26:18 +02:00
Ned Deily
8f13f83f58 Make 3.7 the current dev version in the html version of the docs. 2016-09-20 15:01:06 -04:00
Ned Deily
7582bcaa8f Make 3.7 the current dev version in the html version of the docs. 2016-09-20 15:00:53 -04:00
Ned Deily
a327331cec Make 3.7 the current dev version in the html version of the docs. 2016-09-20 15:00:07 -04:00
Benjamin Peterson
b90d15d57e merge 3.6 2016-09-19 22:20:19 -07:00
Benjamin Peterson
8ac46c972f revert expat changes 2016-09-19 22:20:13 -07:00
Benjamin Peterson
adaa56ac35 merge 3.6 (closes #28184) 2016-09-19 22:17:44 -07:00
Benjamin Peterson
e2e792d98f merge 3.5 (#28184) 2016-09-19 22:17:16 -07:00
Benjamin Peterson
918aa89483 remove trailing whitespace 2016-09-19 22:16:36 -07:00
Jesus Cea
8bf66ca598 MERGE: Docs: Correctly link to the methods 2016-09-20 00:03:09 +02:00
Jesus Cea
1daf6da2c8 MERGE: Docs: Correctly link to the methods 2016-09-20 00:02:44 +02:00
Jesus Cea
647680ec2c Docs: Correctly link to the methods 2016-09-20 00:01:53 +02:00
Victor Stinner
822675b82e Merge 3.6 2016-09-19 11:56:06 +02:00
Victor Stinner
26c03bd7d5 Fix memory leak in path_converter()
Issue #28200: Replace PyUnicode_AsWideCharString() with
PyUnicode_AsUnicodeAndSize().
2016-09-19 11:55:44 +02:00
Benjamin Peterson
ff679c5955 merge 3.6 2016-09-18 23:49:58 -07:00
Benjamin Peterson
286987bbac delete dead code 2016-09-18 23:49:51 -07:00
Benjamin Peterson
cbaaed1b1a merge 3.6 2016-09-18 23:44:15 -07:00
Benjamin Peterson
f5e8e8fc2b merge 3.5 (#24022) 2016-09-18 23:44:02 -07:00
Benjamin Peterson
57bda335e1 merge 3.4 2016-09-18 23:43:18 -07:00
Benjamin Peterson
26d998cfdd properly handle the single null-byte file (closes #24022) 2016-09-18 23:41:11 -07:00
Raymond Hettinger
2113c6e41b merge 2016-09-18 21:46:34 -07:00
Raymond Hettinger
6692f01c91 merge 2016-09-18 21:46:08 -07:00
Raymond Hettinger
7eb1becc25 Issue #28189: dictitems_contains no longer swallows compare errors.
(Patch by Xiang Zhang)
2016-09-18 21:45:11 -07:00
Raymond Hettinger
07064c409c merge 2016-09-18 20:17:51 -07:00
Raymond Hettinger
5820f3a381 Issue #28193: Use lru_cache in the re module. 2016-09-18 20:17:21 -07:00
Benjamin Peterson
f820836e6c merge 3.6 2016-09-18 19:25:00 -07:00