[Python-checkins] cpython (3.5): Issue #25899: Converted non-ASCII characters in docstrings and manpage

serhiy.storchaka python-checkins at python.org
Fri Dec 18 06:13:55 EST 2015


https://hg.python.org/cpython/rev/c87b2f61650f
changeset:   99618:c87b2f61650f
branch:      3.5
parent:      99616:3106caffa79d
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Dec 18 13:05:04 2015 +0200
summary:
  Issue #25899: Converted non-ASCII characters in docstrings and manpage
to ASCII replacements.  Original patch by Chris Angelico.

files:
  Lib/multiprocessing/connection.py |  2 +-
  Misc/python.man                   |  2 +-
  Python/marshal.c                  |  4 ++--
  3 files changed, 4 insertions(+), 4 deletions(-)


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/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


More information about the Python-checkins mailing list