merge 3.5

diff --cc Misc/NEWS
index c411531341bd0be0210cd9a2ea1dbfa01791a16b,b54bd5e7d646ef0b57223d372d00500221af2201..b067f48651dd93b8c5585cb173c8721379eaf232
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -79,34 -36,35 +79,37 @@@ Core and Builtin
    In a brand new thread, raise a RuntimeError since there is no active
    exception to reraise. Patch written by Xiang Zhang.
  
 -- Issue #27419: Standard __import__() no longer look up "__import__" in globals
 -  or builtins for importing submodules or "from import".  Fixed handling an
 -  error of non-string package name.
 +Library
 +-------
  
 -- Issue #27083: Respect the PYTHONCASEOK environment variable under Windows.
 +- Issue #25387: Check return value of winsound.MessageBeep.
  
 -- Issue #27514: Make having too many statically nested blocks a SyntaxError
 -  instead of SystemError.
 +- Issue #27866: Add SSLContext.get_ciphers() method to get a list of all
 +  enabled ciphers.
  
 -- Issue #27473: Fixed possible integer overflow in bytes and bytearray
 -  concatenations.  Patch by Xiang Zhang.
 +- Issue #27744: Add AF_ALG (Linux Kernel crypto) to socket module.
  
 -- Issue #27507: Add integer overflow check in bytearray.extend().  Patch by
 -  Xiang Zhang.
 +- Issue #26470: Port ssl and hashlib module to OpenSSL 1.1.0.
  
 -- Issue #27581: Don't rely on wrapping for overflow check in
 -  PySequence_Tuple().  Patch by Xiang Zhang.
 +- Issue #11620: Fix support for SND_MEMORY in winsound.PlaySound.  Based on a
 +  patch by Tim Lesher.
  
 -- Issue #27443: __length_hint__() of bytearray iterators no longer return a
 -  negative integer for a resized bytearray.
 +- Issue #11734: Add support for IEEE 754 half-precision floats to the
 +  struct module. Based on a patch by Eli Stevens.
  
 -Library
 --------
 +- Issue #27919: Deprecated ``extra_path`` distribution option in distutils
 +  packaging.
  
 -- Issue #26470: Port ssl and hashlib module to OpenSSL 1.1.0.
 +- Issue #23229: Add new ``cmath`` constants: ``cmath.inf`` and ``cmath.nan`` to
 +  match ``math.inf`` and ``math.nan``, and also ``cmath.infj`` and
 +  ``cmath.nanj`` to match the format used by complex repr.
 +
 +- Issue #27842: The csv.DictReader now returns rows of type OrderedDict.
 +  (Contributed by Steve Holden.)
  
+ - Remove support for passing a file descriptor to os.access. It never worked but
+   previously didn't raise.
+ 
  - Issue #12885: Fix error when distutils encounters symlink.
  
  - Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level.

diff --cc Modules/clinic/posixmodule.c.h
index 26dedd1a734147b7e0deb2de282d43c13516fd29,1bbfc062d8241e62f660d7f9cc2f04846ff26e88..4b44257cfbc773f17054ca8b5e6f6496dc687540
--- 1/Modules/clinic/posixmodule.c.h
--- 2/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@@ -135,9 -131,8 +135,9 @@@ static PyObject 
  os_access(PyObject *module, PyObject *args, PyObject *kwargs)
  {
      PyObject *return_value = NULL;
 -    static char *_keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", NULL};
 +    static const char * const _keywords[] = {"path", "mode", "dir_fd", "effective_ids", "follow_symlinks", NULL};
 +    static _PyArg_Parser _parser = {"O&i|$O&pp:access", _keywords, 0};
-     path_t path = PATH_T_INITIALIZE("access", "path", 0, 1);
+     path_t path = PATH_T_INITIALIZE("access", "path", 0, 0);
      int mode;
      int dir_fd = DEFAULT_DIR_FD;
      int effective_ids = 0;
@@@ -6042,4 -5784,4 +6042,4 @@@ exit
  #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF
      #define OS_SET_HANDLE_INHERITABLE_METHODDEF
  #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */
- /*[clinic end generated code: output=97180b6734421a7d input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=9d5f831b23145d1e input=a9049054013a1b77]*/
++/*[clinic end generated code: output=2b85bb3703a6488a input=a9049054013a1b77]*/

diff --cc Modules/posixmodule.c
Simple merge