summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Closes #29177: Merged fix from 3.6.Vinay Sajip2017-01-091-24/+62
|\
| * Fixes #29177: Improved resilience of logging tests which use socket servers.Vinay Sajip2017-01-091-24/+62
| | | | | | | | Thanks to Xavier de Gaye for the report and patch improvements.
* | Closes #29133: merged update from 3.6.Vinay Sajip2017-01-091-15/+11
|\ \ | |/ | | | | Thanks to Evan_ for the report and Marco Buttu for the patch.
| * Fixes #29133: clarified shlex documentation.Vinay Sajip2017-01-091-15/+11
| |
* | Add test for ea064ff3c10fRaymond Hettinger2017-01-091-0/+9
| |
* | Backed out changeset ea064ff3c10fRaymond Hettinger2017-01-091-6/+0
| |
* | While a speedup of 1% is measurable, contexts aren't created that often,Stefan Krah2017-01-091-4/+4
| | | | | | | | so let's defer this until 3.7, 3.8, ... all have this new function.
* | Merge 3.6.Stefan Krah2017-01-091-7/+7
|\ \ | |/
| * Merge 3.5.Stefan Krah2017-01-091-7/+7
| |\
| | * Issue #28701: Revert part of 5bdc8e1a50c8 for the following reasons:Stefan Krah2017-01-091-7/+7
| | | | | | | | | | | | | | | | | | - There was no real problem to begin with. - The hypothetical problem has been fixed by 5bdc8e1a50c8.
* | | Merge 3.6Victor Stinner2017-01-090-0/+0
|\ \ \ | |/ /
| * | Null merge 3.5Victor Stinner2017-01-090-0/+0
| |\ \ | | |/ | | | | | | Python/random.c is more then in the 3.6 branch.
| | * Issue #29157: Prefer getrandom() over getentropy()Victor Stinner2017-01-091-200/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy and then adapt Python/random.c from default branch. Difference between 3.5 and default branches: * Python 3.5 only uses getrandom() in non-blocking mode: flags=GRND_NONBLOCK * If getrandom() fails with EAGAIN: py_getrandom() immediately fails and remembers that getrandom() doesn't work. * Python 3.5 has no _PyOS_URandomNonblock() function: _PyOS_URandom() works in non-blocking mode on Python 3.5
* | | Issue #29190: Fixed possible errors in comparing strings in the pickle module.Serhiy Storchaka2017-01-091-12/+6
|\ \ \ | |/ /
| * | Issue #29190: Fixed possible errors in comparing strings in the pickle module.Serhiy Storchaka2017-01-091-12/+6
| |\ \ | | |/
| | * Issue #29190: Fixed possible errors in comparing strings in the pickle module.Serhiy Storchaka2017-01-091-12/+6
| | |
* | | Issue #29142: Merge 3.6.Xiang Zhang2017-01-093-1/+7
|\ \ \ | |/ /
| * | Issue #29142: Merge 3.5.Xiang Zhang2017-01-093-1/+7
| |\ \ | | |/
| | * Issue #29142: Fix suffixes in no_proxy handling in urllib.Xiang Zhang2017-01-093-1/+6
| | | | | | | | | | | | | | | | | | In urllib.request, suffixes in no_proxy environment variable with leading dots could match related hostnames again (e.g. .b.c matches a.b.c). Patch by Milan Oberkirch.
* | | Sync-up lru_cache() C code with space saving feature in the Python version.Raymond Hettinger2017-01-091-0/+6
| | |
* | | mergeRaymond Hettinger2017-01-090-0/+0
|\ \ \ | |/ /
| * | Sync-up with 3.7 by backporting minor lru_cache code beautificationRaymond Hettinger2017-01-091-3/+4
| | |
* | | Complete the merge for issue #29203Raymond Hettinger2017-01-091-31/+18
| | |
* | | mergeRaymond Hettinger2017-01-092-4/+13
|\ \ \ | |/ /
| * | Issue #29203: functools.lru_cache() now respects PEP 468Raymond Hettinger2017-01-094-35/+35
| | |
* | | Issue #29034: Merge 3.6.Xiang Zhang2017-01-082-53/+58
|\ \ \ | |/ /
| * | Issue #29034: Fix memory leak and use-after-free in path_converter.Xiang Zhang2017-01-082-53/+58
| | |
* | | mergeRaymond Hettinger2017-01-081-0/+8
|\ \ \ | |/ /
| * | Add OrderedDict test for PEP 468 (guaranteed ordered of kwargs)Raymond Hettinger2017-01-081-0/+8
| | |
* | | mergeRaymond Hettinger2017-01-081-4/+5
|\ \ \ | |/ /
| * | Update OrderedDict docs to reflect acceptance of PEP 468Raymond Hettinger2017-01-081-4/+5
| | |
* | | Issue #29200: Fix test to use self.assertEqual instead of py.test style testsRaymond Hettinger2017-01-081-12/+12
| | |
* | | Issue #29200: Add test for lru cache only calling __hash__ onceRaymond Hettinger2017-01-081-0/+36
| | |
* | | Issue #28815: Merge test tweak from 3.6Martin Panter2017-01-081-7/+3
|\ \ \ | |/ /
| * | Issue #28815: Merge test tweak from 3.5Martin Panter2017-01-081-7/+3
| |\ \ | | |/
| | * Issue #28815: Use new exception subclassesMartin Panter2017-01-081-7/+3
| | |
* | | Merge 3.6.Stefan Krah2017-01-081-0/+1
|\ \ \ | |/ /
| * | Add comment why the change in d83884b3a427 wasn't necessary.Stefan Krah2017-01-081-0/+1
| | |
* | | Merge 3.6.Stefan Krah2017-01-081-1/+1
|\ \ \ | |/ /
| * | Revert part of 3cb3e224b692 in code that I maintain.Stefan Krah2017-01-081-1/+1
| | |
* | | Revert part of dbf72357cb4a that is in a rarely used path and causesStefan Krah2017-01-071-1/+1
| | | | | | | | | | | | maintenance issues (cost/benefit).
* | | Revert (unauthorized) parts of 54a89144ee1d which are not in a speed-sensitiveStefan Krah2017-01-071-4/+4
| | | | | | | | | | | | path in order to avoid maintenance issues.
* | | Revert (unauthorized) parts of b9eb35435178 which are not in a speed-sensitiveStefan Krah2017-01-071-1/+1
| | | | | | | | | | | | path and cause maintenance issues (3.6 <-> 3.7, private test suite).
* | | Issue #16026: Merge from 3.6Berker Peksag2017-01-071-6/+6
|\ \ \ | |/ /
| * | Issue #16026: Fix parameter names of DictReader and DictWriterBerker Peksag2017-01-071-6/+6
| | | | | | | | | | | | | | | | | | | | | CPython and PyPy use f as the name of the first parameter of DictReader and DictWriter classes. Patch by James Salt and Greg Bengeult.
* | | Null merge 3.6Victor Stinner2017-01-060-0/+0
|\ \ \ | |/ /
| * | Issue #29157: Prefer getrandom() over getentropy()Victor Stinner2017-01-061-87/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dev_urandom() now calls py_getentropy(). Prepare the fallback to support getentropy() failure and falls back on reading from /dev/urandom. * Simplify dev_urandom(). pyurandom() is now responsible to call getentropy() or getrandom(). Enhance also dev_urandom() and pyurandom() documentation. * getrandom() is now preferred over getentropy(). The glibc 2.24 now implements getentropy() on Linux using the getrandom() syscall. But getentropy() doesn't support non-blocking mode. Since getrandom() is tried first, it's not more needed to explicitly exclude getentropy() on Solaris. Replace: "if defined(HAVE_GETENTROPY) && !defined(sun)" with "if defined(HAVE_GETENTROPY)" * Enhance py_getrandom() documentation. py_getentropy() now supports ENOSYS, EPERM & EINTR
* | | Merge 3.6Victor Stinner2017-01-063-2/+18
|\ \ \ | |/ /
| * | Fix unittest.mock._Call: don't ignore nameVictor Stinner2017-01-063-2/+18
| | | | | | | | | | | | | | | | | | | | | Issue #28961: Fix unittest.mock._Call helper: don't ignore the name parameter anymore. Patch written by Jiajun Huang.
* | | Issue #29157: enhance py_getrandom() documentationVictor Stinner2017-01-061-13/+20
| | |