summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/email/_header_value_parser.py4
-rw-r--r--Lib/idlelib/configdialog.py4
-rw-r--r--Lib/opcode.py2
-rw-r--r--Lib/test/datetimetester.py2
-rw-r--r--Lib/test/test_cmd.py4
-rw-r--r--Lib/test/test_generators.py4
-rw-r--r--Lib/test/test_weakref.py2
-rw-r--r--Lib/unittest/test/test_discovery.py4
8 files changed, 13 insertions, 13 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index b23c897..14ffd30 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -2746,8 +2746,8 @@ def _fold_mime_parameters(part, lines, maxlen, encoding):
Using the decoded list of parameters and values, format them according to
the RFC rules, including using RFC2231 encoding if the value cannot be
- expressed in 'encoding' and/or the paramter+value is too long to fit within
- 'maxlen'.
+ expressed in 'encoding' and/or the parameter+value is too long to fit
+ within 'maxlen'.
"""
# Special case for RFC2231 encoding: start from decoded values and use
diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 4e8394b..231e14e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -495,7 +495,7 @@ class FontPage(Frame):
Changing any of the font vars invokes var_changed_font, which
adds all 3 font options to changes and calls set_samples.
Set_samples applies a new font constructed from the font vars to
- font_sample and to highlight_sample on the hightlight page.
+ font_sample and to highlight_sample on the highlight page.
Tabs: Enable users to change spaces entered for indent tabs.
Changing indent_scale value with the mouse sets Var space_num,
@@ -646,7 +646,7 @@ class FontPage(Frame):
Called on font initialization and change events.
Accesses font_name, font_size, and font_bold Variables.
- Updates font_sample and hightlight page highlight_sample.
+ Updates font_sample and highlight page highlight_sample.
"""
font_name = self.font_name.get()
font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
diff --git a/Lib/opcode.py b/Lib/opcode.py
index b5916b6..eb6bb8e 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -142,7 +142,7 @@ name_op('LOAD_NAME', 101) # Index in name list
def_op('BUILD_TUPLE', 102) # Number of tuple items
def_op('BUILD_LIST', 103) # Number of list items
def_op('BUILD_SET', 104) # Number of set items
-def_op('BUILD_MAP', 105) # Number of dict entries (upto 255)
+def_op('BUILD_MAP', 105) # Number of dict entries
name_op('LOAD_ATTR', 106) # Index in name list
def_op('COMPARE_OP', 107) # Comparison operator
hascompare.append(107)
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index f23a530..96120c3 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1709,7 +1709,7 @@ class TestDateTime(TestDate):
# Make sure comparison doesn't forget microseconds, and isn't done
# via comparing a float timestamp (an IEEE double doesn't have enough
- # precision to span microsecond resolution across years 1 thru 9999,
+ # precision to span microsecond resolution across years 1 through 9999,
# so comparing via timestamp necessarily calls some distinct values
# equal).
dt1 = self.theclass(MAXYEAR, 12, 31, 23, 59, 59, 999998)
diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py
index dd8981f..bdcbb98 100644
--- a/Lib/test/test_cmd.py
+++ b/Lib/test/test_cmd.py
@@ -52,7 +52,7 @@ class samplecmdclass(cmd.Cmd):
Test for the function completedefault():
>>> mycmd.completedefault()
- This is the completedefault methode
+ This is the completedefault method
>>> mycmd.completenames("a")
['add']
@@ -141,7 +141,7 @@ class samplecmdclass(cmd.Cmd):
print("Hello from postloop")
def completedefault(self, *ignored):
- print("This is the completedefault methode")
+ print("This is the completedefault method")
def complete_command(self):
print("complete command")
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index b8d5bbe..d9ceeb5 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -1517,7 +1517,7 @@ class Knights:
succs[final].remove(corner)
add_to_successors(this)
- # Generate moves 3 thru m*n-1.
+ # Generate moves 3 through m*n-1.
def advance(len=len):
# If some successor has only one exit, must take it.
# Else favor successors with fewer exits.
@@ -1539,7 +1539,7 @@ class Knights:
yield i
add_to_successors(i)
- # Generate moves 3 thru m*n-1. Alternative version using a
+ # Generate moves 3 through m*n-1. Alternative version using a
# stronger (but more expensive) heuristic to order successors.
# Since the # of backtracking levels is m*n, a poor move early on
# can take eons to undo. Smallest square board for which this
diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 43cf2c0..ec0f1d4 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -1637,7 +1637,7 @@ class MappingTestCase(TestBase):
# has to keep looping to find the first object we delete.
objs.reverse()
- # Turn on mutation in C.__eq__. The first time thru the loop,
+ # Turn on mutation in C.__eq__. The first time through the loop,
# under the iterkeys() business the first comparison will delete
# the last item iterkeys() would see, and that causes a
# RuntimeError: dictionary changed size during iteration
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 48d8fe9..227b44a 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -199,8 +199,8 @@ class TestDiscovery(unittest.TestCase):
['a_directory', 'test_directory', 'test_directory2'])
# load_tests should have been called once with loader, tests and pattern
- # (but there are no tests in our stub module itself, so thats [] at the
- # time of call.
+ # (but there are no tests in our stub module itself, so that is [] at
+ # the time of call).
self.assertEqual(Module.load_tests_args,
[(loader, [], 'test*')])