From: Martin Panter <vadmium>
Date: Wed, 9 Sep 2015 06:27:43 +0000 (+0000)
Subject: Merge 3.4 into 3.5
X-Git-Tag: v3.5.1rc1~413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6088b7bd492aed4524a34156a1ecfd5facc17faa;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 into 3.5
---

6088b7bd492aed4524a34156a1ecfd5facc17faa
diff --cc Doc/library/os.rst
index 25888e493e36,984f2dd68710..13f83c603757
--- a/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*.