summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-14 01:07:43 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-14 01:07:43 (GMT)
commit2e4571a456c32af964d48b4bf70a9a53d27d10d6 (patch)
tree7068a1842fae492ea6994768160d20c3eabb8629
parentac34e09bbfe59e0d2075be7db317b91da6ca2c69 (diff)
downloadcpython-2e4571a456c32af964d48b4bf70a9a53d27d10d6.zip
cpython-2e4571a456c32af964d48b4bf70a9a53d27d10d6.tar.gz
cpython-2e4571a456c32af964d48b4bf70a9a53d27d10d6.tar.bz2
Fix a few grammar problems in the documentation and comments
-rw-r--r--Doc/library/ast.rst2
-rw-r--r--Doc/library/copy.rst4
-rw-r--r--Doc/library/ftplib.rst4
-rw-r--r--Lib/doctest.py2
-rw-r--r--Lib/test/test_argparse.py2
5 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 1ee5110..5373acd 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -104,7 +104,7 @@ The abstract grammar is currently defined as follows:
:mod:`ast` Helpers
------------------
-Apart from the node classes, :mod:`ast` module defines these utility functions
+Apart from the node classes, the :mod:`ast` module defines these utility functions
and classes for traversing abstract syntax trees:
.. function:: parse(source, filename='<unknown>', mode='exec')
diff --git a/Doc/library/copy.rst b/Doc/library/copy.rst
index 1db5c2d..02ef0e5 100644
--- a/Doc/library/copy.rst
+++ b/Doc/library/copy.rst
@@ -67,8 +67,8 @@ of lists by assigning a slice of the entire list, for example,
Classes can use the same interfaces to control copying that they use to control
pickling. See the description of module :mod:`pickle` for information on these
-methods. In fact, :mod:`copy` module uses the registered pickle functions from
-:mod:`copyreg` module.
+methods. In fact, the :mod:`copy` module uses the registered
+pickle functions from the :mod:`copyreg` module.
.. index::
single: __copy__() (copy protocol)
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 2521f49..3d1f783 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -418,8 +418,8 @@ FTP_TLS Objects
.. method:: FTP_TLS.auth()
- Set up secure control connection by using TLS or SSL, depending on what
- specified in :meth:`ssl_version` attribute.
+ Set up a secure control connection by using TLS or SSL, depending on what
+ is specified in the :attr:`ssl_version` attribute.
.. versionchanged:: 3.4
The method now supports hostname check with
diff --git a/Lib/doctest.py b/Lib/doctest.py
index 64e6d71..432ef05 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1573,7 +1573,7 @@ class OutputChecker:
# If `want` contains hex-escaped character such as "\u1234",
# then `want` is a string of six characters(e.g. [\,u,1,2,3,4]).
- # On the other hand, `got` could be an another sequence of
+ # On the other hand, `got` could be another sequence of
# characters such as [\u1234], so `want` and `got` should
# be folded to hex-escaped ASCII string to compare.
got = self._toAscii(got)
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index ecc5507..5efdb67 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -3019,7 +3019,7 @@ class TestShortColumns(HelpTestCase):
'''Test extremely small number of columns.
TestCase prevents "COLUMNS" from being too small in the tests themselves,
- but we don't want any exceptions thrown in such case. Only ugly representation.
+ but we don't want any exceptions thrown in such cases. Only ugly representation.
'''
def setUp(self):
env = support.EnvironmentVarGuard()