summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-12-18 11:10:37 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-12-18 11:10:37 (GMT)
commit3fd4a735d82e43e1c531ebcead3c95814d4b6384 (patch)
treef5640c599b2ec88167d3d6c39732357a085e0bd7
parentbe22a911ff15f890702d134c0360419c3167da09 (diff)
parent225821c6537ec4c3b5269edabbf914527d6a7031 (diff)
downloadcpython-3fd4a735d82e43e1c531ebcead3c95814d4b6384.zip
cpython-3fd4a735d82e43e1c531ebcead3c95814d4b6384.tar.gz
cpython-3fd4a735d82e43e1c531ebcead3c95814d4b6384.tar.bz2
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.
-rw-r--r--Lib/http/client.py4
-rw-r--r--Lib/multiprocessing/connection.py2
-rw-r--r--Lib/urllib/request.py6
-rw-r--r--Misc/NEWS2
-rw-r--r--Misc/python.man2
-rw-r--r--Python/marshal.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 155c2e3..f69e7ba 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -735,9 +735,9 @@ class HTTPResponse(io.BufferedIOBase):
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
index 4c32237..d0a1b86 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -397,7 +397,7 @@ class Connection(_ConnectionBase):
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
index 57d0dea..88326f8 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -179,14 +179,14 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
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
index aadc3cb..3bb46fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,4 +1,4 @@
-+++++++++++
++++++++++++
Python News
+++++++++++
diff --git a/Misc/python.man b/Misc/python.man
index 6dbdba9..4e1a81d 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -143,7 +143,7 @@ raises an exception.
.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
index f89cd04..5b8de99 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1644,7 +1644,7 @@ The file must be an open file object such as sys.stdout or returned by\n\
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 @@ PyDoc_STRVAR(load_doc,
"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\