Merge typo fixes from 3.5
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 7222636..229b9a1 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -708,7 +708,7 @@
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 f0c1905..55d553d 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -2069,7 +2069,7 @@
/* 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 80b0dcb..763e1ef 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1204,7 +1204,7 @@
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 31db090..52c6247 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -534,7 +534,7 @@
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 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 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 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 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 1ece514..f4c8cdc 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -43,7 +43,7 @@
line = linecache.getline(msg.filename, msg.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
linecache = None
else:
diff --git a/Misc/NEWS b/Misc/NEWS
index 8cd2339..992b00c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2406,7 +2406,7 @@
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.
@@ -7420,7 +7420,7 @@
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.
@@ -8103,7 +8103,7 @@
- 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 0e45283..02709e3 100644
--- a/README
+++ b/README
@@ -71,7 +71,7 @@
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.