From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 19 Dec 2016 14:05:46 +0000 (+0800)
Subject: Issue #28950: Merge 3.6.
X-Git-Tag: v3.7.0a1~1712
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f76df278068252fe7637caeb2d7166f761f124fb;p=thirdparty%2FPython%2Fcpython.git

Issue #28950: Merge 3.6.
---

f76df278068252fe7637caeb2d7166f761f124fb
diff --cc Misc/NEWS
index 5bf0f323961e,8fcdec5fd369..1aa0a7525f07
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -627,27 -690,8 +627,30 @@@ Tools/Demo
  Tests
  -----
  
++- Issue #28950: Disallow -j0 to be combined with -T/-l in regrtest
++  command line arguments.
++
 +- Issue #28683: Fix the tests that bind() a unix socket and raise
 +  PermissionError on Android for a non-root user.
 +
 + - Issue #26936: Fix the test_socket failures on Android - getservbyname(),
 +   getservbyport() and getaddrinfo() are broken on some Android API levels.
 +
 +- Issue #28666: Now test.support.rmtree is able to remove unwritable or
 +  unreadable directories.
 +
 +- Issue #23839: Various caches now are cleared before running every test file.
 +
 +- Issue #26944: Fix test_posix for Android where 'id -G' is entirely wrong or
 +  missing the effective gid.
 +
 +- Issue #28409: regrtest: fix the parser of command line arguments.
 +
  - Issue #28217: Adds _testconsole module to test console input.
  
 +- Issue #26939: Add the support.setswitchinterval() function to fix
 +  test_functools hanging on the Android armv7 qemu emulator.
 +
  
  What's New in Python 3.6.0 beta 1
  =================================