summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-08-05 01:51:39 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-08-05 01:51:39 (GMT)
commit02b75abf731831e32bbb8007a3278c14f6ad700a (patch)
tree3cb25748c067ffda3e2f1a718d9596a180821138 /Lib
parenta31ddb33511f92d20dfddb23d934a0b7f4ab6122 (diff)
parent69332c1a64d6bdb80ff813fab403be832e12ce64 (diff)
downloadcpython-02b75abf731831e32bbb8007a3278c14f6ad700a.zip
cpython-02b75abf731831e32bbb8007a3278c14f6ad700a.tar.gz
cpython-02b75abf731831e32bbb8007a3278c14f6ad700a.tar.bz2
Merge spelling and grammar fixes from 3.5
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_cmd_line.py2
-rw-r--r--Lib/test/test_docxmlrpc.py2
-rw-r--r--Lib/test/test_socket.py2
-rw-r--r--Lib/threading.py2
-rw-r--r--Lib/tkinter/ttk.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 8faa8e1..87571d3 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -466,7 +466,7 @@ class CmdLineTest(unittest.TestCase):
rc, out, err = assert_python_ok('-I', '-c',
'from sys import flags as f; '
'print(f.no_user_site, f.ignore_environment, f.isolated)',
- # dummyvar to prevent extranous -E
+ # dummyvar to prevent extraneous -E
dummyvar="")
self.assertEqual(out.strip(), b'1 1 1')
with test.support.temp_cwd() as tmpdir:
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index e6ca961..15a4ae2 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -164,7 +164,7 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
@make_request_and_skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -O2 and above")
def test_system_methods(self):
- """Test the precense of three consecutive system.* methods.
+ """Test the presence of three consecutive system.* methods.
This also tests their use of parameter type recognition and the
systems related to that process.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index faacd61..7fce13e 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -708,7 +708,7 @@ class GeneralModuleTests(unittest.TestCase):
raise socket.gaierror
def testSendtoErrors(self):
- # Testing that sendto doesn't masks failures. See #10169.
+ # Testing that sendto doesn't mask failures. See #10169.
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self.addCleanup(s.close)
s.bind(('', 0))
diff --git a/Lib/threading.py b/Lib/threading.py
index d09fcae..4829ff4 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -641,7 +641,7 @@ class Barrier:
self._break()
raise
- # Wait in the barrier until we are relased. Raise an exception
+ # Wait in the barrier until we are released. Raise an exception
# if the barrier is reset or broken.
def _wait(self, timeout):
if not self._cond.wait_for(lambda : self._state != 0, timeout):
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index 71ac2a7..c474e60 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -153,7 +153,7 @@ def _format_elemcreate(etype, script=False, *args, **kw):
def _format_layoutlist(layout, indent=0, indent_size=2):
"""Formats a layout list so we can pass the result to ttk::style
- layout and ttk::style settings. Note that the layout doesn't has to
+ layout and ttk::style settings. Note that the layout doesn't have to
be a list necessarily.
E.g.: