diff options
| -rw-r--r-- | Doc/library/ast.rst | 2 | ||||
| -rw-r--r-- | Doc/library/copy.rst | 4 | ||||
| -rw-r--r-- | Doc/library/ftplib.rst | 4 | ||||
| -rw-r--r-- | Doc/library/urllib.request.rst | 2 | ||||
| -rw-r--r-- | Lib/doctest.py | 2 | ||||
| -rw-r--r-- | Lib/http/cookiejar.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_argparse.py | 2 |
7 files changed, 12 insertions, 12 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/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 81aeb12..8755155 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -1168,7 +1168,7 @@ The code for the sample CGI used in the above example is:: #!/usr/bin/env python import sys data = sys.stdin.read() - print('Content-type: text-plain\n\nGot Data: "%s"' % data) + print('Content-type: text/plain\n\nGot Data: "%s"' % data) Here is an example of doing a ``PUT`` request using :class:`Request`:: diff --git a/Lib/doctest.py b/Lib/doctest.py index 96ab0c4..4094723 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1575,7 +1575,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/http/cookiejar.py b/Lib/http/cookiejar.py index e215398..ac5e667 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -423,10 +423,10 @@ def join_header_words(lists): Takes a list of lists of (key, value) pairs and produces a single header value. Attribute values are quoted if needed. - >>> join_header_words([[("text/plain", None), ("charset", "iso-8859/1")]]) - 'text/plain; charset="iso-8859/1"' - >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859/1")]]) - 'text/plain, charset="iso-8859/1"' + >>> join_header_words([[("text/plain", None), ("charset", "iso-8859-1")]]) + 'text/plain; charset="iso-8859-1"' + >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859-1")]]) + 'text/plain, charset="iso-8859-1"' """ headers = [] diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 27bfad5..f48e85c 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -3026,7 +3026,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() |