cpython (merge 3.5 -> default): Issue #25899: Converted non-ASCII characters in docstrings and manpage
https://hg.python.org/cpython/rev/1eeb25f08cfd changeset: 99619:1eeb25f08cfd parent: 99617:a3f076d4f54f parent: 99618:c87b2f61650f user: Serhiy Storchaka <storchaka@gmail.com> date: Fri Dec 18 13:10:37 2015 +0200 summary: Issue #25899: Converted non-ASCII characters in docstrings and manpage to ASCII replacements. Removed UTF-8 BOM from Misc/NEWS. Original patch by Chris Angelico. files: Lib/http/client.py | 4 ++-- Lib/multiprocessing/connection.py | 2 +- Lib/urllib/request.py | 6 +++--- Misc/NEWS | 2 +- Misc/python.man | 2 +- Python/marshal.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/http/client.py b/Lib/http/client.py --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -735,9 +735,9 @@ guessed. When the method is local-file, returned headers will include - a Date representing the file’s last-modified time, a + a Date representing the file's last-modified time, a Content-Length giving file size, and a Content-Type - containing a guess at the file’s type. See also the + containing a guess at the file's type. See also the description of the mimetools module. ''' diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -397,7 +397,7 @@ self._send(header) self._send(buf) else: - # Issue # 20540: concatenate before sending, to avoid delays due + # Issue #20540: concatenate before sending, to avoid delays due # to Nagle's algorithm on a TCP socket. # Also note we want to avoid sending a 0-length buffer separately, # to avoid "broken pipe" errors if the other end closed the pipe. diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -179,14 +179,14 @@ urllib.response.addinfourl object which can work as context manager and has methods such as: - * geturl() — return the URL of the resource retrieved, commonly used to + * geturl() - return the URL of the resource retrieved, commonly used to determine if a redirect was followed - * info() — return the meta-information of the page, such as headers, in the + * info() - return the meta-information of the page, such as headers, in the form of an email.message_from_string() instance (see Quick Reference to HTTP Headers) - * getcode() – return the HTTP status code of the response. Raises URLError + * getcode() - return the HTTP status code of the response. Raises URLError on errors. Note that *None& may be returned if no handler handles the request (though diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1,4 +1,4 @@ -+++++++++++ ++++++++++++ Python News +++++++++++ diff --git a/Misc/python.man b/Misc/python.man --- a/Misc/python.man +++ b/Misc/python.man @@ -143,7 +143,7 @@ .TP .B \-I Run Python in isolated mode. This also implies \fB\-E\fP and \fB\-s\fP. In -isolated mode sys.path contains neither the script’s directory nor the user’s +isolated mode sys.path contains neither the script's directory nor the user's site-packages directory. All PYTHON* environment variables are ignored, too. Further restrictions may be imposed to prevent the user from injecting malicious code. diff --git a/Python/marshal.c b/Python/marshal.c --- a/Python/marshal.c +++ b/Python/marshal.c @@ -1644,7 +1644,7 @@ open() or os.popen(). It must be opened in binary mode ('wb' or 'w+b').\n\ \n\ If the value has (or contains an object that has) an unsupported type, a\n\ -ValueError exception is raised — but garbage data will also be written\n\ +ValueError exception is raised - but garbage data will also be written\n\ to the file. The object will not be properly read back by load()\n\ \n\ The version argument indicates the data format that dump should use."); @@ -1695,7 +1695,7 @@ "load(file)\n\ \n\ Read one value from the open file and return it. If no valid value is\n\ -read (e.g. because the data has a different Python version’s\n\ +read (e.g. because the data has a different Python version's\n\ incompatible marshal format), raise EOFError, ValueError or TypeError.\n\ The file must be an open file object opened in binary mode ('rb' or\n\ 'r+b').\n\ -- Repository URL: https://hg.python.org/cpython
participants (1)
-
serhiy.storchaka