Merge 3.4 into 3.5

diff --cc Doc/library/os.rst
index 25888e493e362b1e490dca7e4971752c9b2b789c,984f2dd687102b038295bfd8dc20d227165f3089..13f83c603757dd5d35f7101c57c90249675b8665
--- 1/Doc/library/os.rst
--- 2/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@@ -1065,14 -1070,9 +1065,14 @@@ or `the MSDN <http://msdn.microsoft.com
        :func:`popen` or :func:`fdopen`, or :data:`sys.stdin`, use its
        :meth:`~file.read` or :meth:`~file.readline` methods.
  
 +   .. versionchanged:: 3.5
 +      If the system call is interrupted and the signal handler does not raise an
 +      exception, the function now retries the system call instead of raising an
 +      :exc:`InterruptedError` exception (see :pep:`475` for the rationale).
 +
  
  .. function:: sendfile(out, in, offset, count)
-               sendfile(out, in, offset, count, headers=None, trailers=None, flags=0)
+               sendfile(out, in, offset, count, [headers], [trailers], flags=0)
  
     Copy *count* bytes from file descriptor *in* to file descriptor *out*
     starting at *offset*.

diff --cc Lib/test/test_os.py
Simple merge

diff --cc Modules/posixmodule.c
Simple merge