summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-11-02 12:40:41 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-11-02 12:40:41 (GMT)
commitf51d715845dfede2803ef7a2e6ea4e2a03f18486 (patch)
tree976bc3c3a7633d32b6bccb715cda9da34857e6c4
parenta84f6c3dd3ef02bdbbc67b4cd1223749f3c39030 (diff)
downloadcpython-f51d715845dfede2803ef7a2e6ea4e2a03f18486.zip
cpython-f51d715845dfede2803ef7a2e6ea4e2a03f18486.tar.gz
cpython-f51d715845dfede2803ef7a2e6ea4e2a03f18486.tar.bz2
Issue #25523: Further a-to-an corrections new in 3.5.
-rw-r--r--Doc/library/glob.rst2
-rw-r--r--Lib/test/test_asdl_parser.py2
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_ssl.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index 50f38a4..d16b001 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -38,7 +38,7 @@ For example, ``'[?]'`` matches the character ``'?'``.
symlinks are included in the results (as in the shell).
If *recursive* is true, the pattern "``**``" will match any files and zero or
- more directories and subdirectories. If the pattern is followed by a
+ more directories and subdirectories. If the pattern is followed by an
``os.sep``, only directories and subdirectories match.
.. note::
diff --git a/Lib/test/test_asdl_parser.py b/Lib/test/test_asdl_parser.py
index 7a6426a..15bc684 100644
--- a/Lib/test/test_asdl_parser.py
+++ b/Lib/test/test_asdl_parser.py
@@ -21,7 +21,7 @@ class TestAsdlParser(unittest.TestCase):
def setUpClass(cls):
# Loads the asdl module dynamically, since it's not in a real importable
# package.
- # Parses Python.asdl into a ast.Module and run the check on it.
+ # Parses Python.asdl into an ast.Module and run the check on it.
# There's no need to do this for each test method, hence setUpClass.
sys.path.insert(0, parser_dir)
loader = importlib.machinery.SourceFileLoader(
diff --git a/Misc/NEWS b/Misc/NEWS
index 5fb54d8..9626c49 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2483,7 +2483,7 @@ Library
- Issue #20170: Convert posixmodule to use Argument Clinic.
-- Issue #21539: Add a *exists_ok* argument to `Pathlib.mkdir()` to mimic
+- Issue #21539: Add an *exists_ok* argument to `Pathlib.mkdir()` to mimic
`mkdir -p` and `os.makedirs()` functionality. When true, ignore
FileExistsErrors. Patch by Berker Peksag.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 5d20e7c..4f4379f 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3273,7 +3273,7 @@ _servername_callback(SSL *s, int *al, void *args)
ssl = SSL_get_app_data(s);
assert(PySSLSocket_Check(ssl));
- /* The servername callback expects a argument that represents the current
+ /* The servername callback expects an argument that represents the current
* SSL connection and that has a .context attribute that can be changed to
* identify the requested hostname. Since the official API is the Python
* level API we want to pass the callback a Python level object rather than