summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:33 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:33 (GMT)
commitf157982b2c66be30d94a3f3ce0dfc2d9ebd3bd19 (patch)
tree39c71ffdf07566b30f7dc3a64c0b76e99be6240a
parent3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1 (diff)
downloadcpython-f157982b2c66be30d94a3f3ce0dfc2d9ebd3bd19.zip
cpython-f157982b2c66be30d94a3f3ce0dfc2d9ebd3bd19.tar.gz
cpython-f157982b2c66be30d94a3f3ce0dfc2d9ebd3bd19.tar.bz2
Issue #27076: More doc and comment spelling fixes for 3.6, by Ville Skyttä
-rw-r--r--Doc/library/datetime.rst2
-rw-r--r--Doc/library/imaplib.rst2
-rw-r--r--Lib/statistics.py4
-rw-r--r--Lib/test/test_itertools.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index b99017f..b125588 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -2079,7 +2079,7 @@ Notes:
Similar to ``%U`` and ``%W``, ``%V`` is only used in calculations when the
day of the week and the ISO year (``%G``) are specified in a
:meth:`strptime` format string. Also note that ``%G`` and ``%Y`` are not
- interchangable.
+ interchangeable.
.. rubric:: Footnotes
diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst
index f604cfb..e33bac0 100644
--- a/Doc/library/imaplib.rst
+++ b/Doc/library/imaplib.rst
@@ -507,7 +507,7 @@ An :class:`IMAP4` instance has the following methods:
allowed creation of such tags, and popular IMAP servers, such as Gmail,
accept and produce such flags. There are non-Python programs which also
create such tags. Although it is an RFC violation and IMAP clients and
- servers are supposed to be strict, imaplib nontheless continues to allow
+ servers are supposed to be strict, imaplib nonetheless continues to allow
such tags to be created for backward compatibility reasons, and as of
python 3.6, handles them if they are sent from the server, since this
improves real-world compatibility.
diff --git a/Lib/statistics.py b/Lib/statistics.py
index fc0c3d2..b081b5a 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -430,9 +430,9 @@ def median_grouped(data, interval=1):
L = float(x) - float(interval)/2
# Uses bisection search to search for x in data with log(n) time complexity
- # Find the position of leftmost occurence of x in data
+ # Find the position of leftmost occurrence of x in data
l1 = _find_lteq(data, x)
- # Find the position of rightmost occurence of x in data[l1...len(data)]
+ # Find the position of rightmost occurrence of x in data[l1...len(data)]
# Assuming always l1 <= l2
l2 = _find_rteq(data, l1, x)
cf = l1
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 3bbfdf1..945c58d 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -635,7 +635,7 @@ class TestBasicOps(unittest.TestCase):
# Mode 0 is efficient. It uses an incompletely consumed input
# iterator to build a cycle object and then passes in state with
# a list of previously consumed values. There is no data
- # overlap bewteen the two.
+ # overlap between the two.
c = cycle('defg')
c.__setstate__((list('abc'), 0))
self.assertEqual(take(20, c), list('defgabcdefgabcdefgab'))