summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-05 06:19:42 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-04-05 06:19:42 (GMT)
commitcc71a795df4986bca5f88ce1e30f81608ca7387d (patch)
tree2372590be9a189f04f3e1cd048af3fd5255a4ae7
parent28f35b24b67961626caa00dfee2c18223a05b696 (diff)
downloadcpython-cc71a795df4986bca5f88ce1e30f81608ca7387d.zip
cpython-cc71a795df4986bca5f88ce1e30f81608ca7387d.tar.gz
cpython-cc71a795df4986bca5f88ce1e30f81608ca7387d.tar.bz2
Fix typos in documentation and comments
-rw-r--r--Doc/library/dis.rst2
-rw-r--r--Include/unicodeobject.h2
-rw-r--r--Lib/http/client.py2
-rw-r--r--Lib/test/test_argparse.py10
-rw-r--r--Lib/warnings.py2
-rw-r--r--Misc/NEWS6
-rw-r--r--README2
7 files changed, 13 insertions, 13 deletions
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 1bcb3a4..68c196e 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -708,7 +708,7 @@ the more significant byte last.
Implements assignment with a starred target: Unpacks an iterable in TOS into
individual values, where the total number of values can be smaller than the
- number of items in the iterable: one the new values will be a list of all
+ number of items in the iterable: one of the new values will be a list of all
leftover items.
The low byte of *counts* is the number of values before the list value, the
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 09c9b21..143abd0 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -2052,7 +2052,7 @@ PyAPI_FUNC(PyObject *) PyUnicode_Format(
/* Checks whether element is contained in container and return 1/0
accordingly.
- element has to coerce to an one element Unicode string. -1 is
+ element has to coerce to a one element Unicode string. -1 is
returned in case of an error. */
PyAPI_FUNC(int) PyUnicode_Contains(
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 2d6e07b..350313e8 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1155,7 +1155,7 @@ class HTTPConnection:
If the HTTPConnection is in the correct state, returns an
instance of HTTPResponse or of whatever object is returned by
- class the response_class variable.
+ the response_class variable.
If a request has not been sent or if a previous response has
not be handled, ResponseNotReady is raised. If the HTTP
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index f48e85c..f9ee398 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -534,7 +534,7 @@ class TestOptionalsNargsDefault(ParserTestCase):
class TestOptionalsNargs1(ParserTestCase):
- """Tests specifying the 1 arg for an Optional"""
+ """Tests specifying 1 arg for an Optional"""
argument_signatures = [Sig('-x', nargs=1)]
failures = ['a', '-x']
@@ -545,7 +545,7 @@ class TestOptionalsNargs1(ParserTestCase):
class TestOptionalsNargs3(ParserTestCase):
- """Tests specifying the 3 args for an Optional"""
+ """Tests specifying 3 args for an Optional"""
argument_signatures = [Sig('-x', nargs=3)]
failures = ['a', '-x', '-x a', '-x a b', 'a -x', 'a -x b']
@@ -579,7 +579,7 @@ class TestOptionalsNargsOptional(ParserTestCase):
class TestOptionalsNargsZeroOrMore(ParserTestCase):
- """Tests specifying an args for an Optional that accepts zero or more"""
+ """Tests specifying args for an Optional that accepts zero or more"""
argument_signatures = [
Sig('-x', nargs='*'),
@@ -598,7 +598,7 @@ class TestOptionalsNargsZeroOrMore(ParserTestCase):
class TestOptionalsNargsOneOrMore(ParserTestCase):
- """Tests specifying an args for an Optional that accepts one or more"""
+ """Tests specifying args for an Optional that accepts one or more"""
argument_signatures = [
Sig('-x', nargs='+'),
@@ -1251,7 +1251,7 @@ class TestPrefixCharacterOnlyArguments(ParserTestCase):
class TestNargsZeroOrMore(ParserTestCase):
- """Tests specifying an args for an Optional that accepts zero or more"""
+ """Tests specifying args for an Optional that accepts zero or more"""
argument_signatures = [Sig('-x', nargs='*'), Sig('y', nargs='*')]
failures = []
diff --git a/Lib/warnings.py b/Lib/warnings.py
index cf9f5b2..dfa13ee 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -28,7 +28,7 @@ def formatwarning(message, category, filename, lineno, line=None):
line = linecache.getline(filename, lineno)
except Exception:
# When a warning is logged during Python shutdown, linecache
- # and the improt machinery don't work anymore
+ # and the import machinery don't work anymore
line = None
if line:
line = line.strip()
diff --git a/Misc/NEWS b/Misc/NEWS
index 6d43666..b695831 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1812,7 +1812,7 @@ Library
Build
-----
-- Issue #23817: FreeBSD now uses "1.0" the the SOVERSION as other operating
+- Issue #23817: FreeBSD now uses "1.0" in the SOVERSION as other operating
systems, instead of just "1".
- Issue #23501: Argument Clinic now generates code into separate files by default.
@@ -6826,7 +6826,7 @@ Library
Thomas Barlow.
- Issue #17358: Modules loaded by imp.load_source() and load_compiled() (and by
- extention load_module()) now have a better chance of working when reloaded.
+ extension load_module()) now have a better chance of working when reloaded.
- Issue #17804: New function ``struct.iter_unpack`` allows for streaming
struct unpacking.
@@ -7509,7 +7509,7 @@ Library
- Issue #16284: Prevent keeping unnecessary references to worker functions
in concurrent.futures ThreadPoolExecutor.
-- Issue #16230: Fix a crash in select.select() when one the lists changes
+- Issue #16230: Fix a crash in select.select() when one of the lists changes
size while iterated on. Patch by Serhiy Storchaka.
- Issue #16228: Fix a crash in the json module where a list changes size
diff --git a/README b/README
index 1ba742e..d58c409 100644
--- a/README
+++ b/README
@@ -71,7 +71,7 @@ profile the interpreter execution. Note also that any output, both stdout
and stderr, that may appear at this step is supressed.
Finally, the last step is to rebuild the interpreter, using the information
-collected in the previous one. The end result will be a the Python binary
+collected in the previous one. The end result will be a Python binary
that is optimized and suitable for distribution or production installation.