summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-29 09:05:06 (GMT)
commite501a93c18085a0ae0000a759438dcf3c162ddb6 (patch)
tree6ce860fadb4cd92c8c1df44297b07dde7c41d1d1 /Lib
parent2bac3b778f0a3efe374334b9694e99ed48431414 (diff)
parent8d56c026a5dd724318be005465366d5140fa6fe7 (diff)
downloadcpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.zip
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.gz
cpython-e501a93c18085a0ae0000a759438dcf3c162ddb6.tar.bz2
Issue #27125: Merge typo fixes from 3.5
Also merge changes from Issue #27117; no actual code changes to 3.6.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/collections/__init__.py3
-rw-r--r--Lib/email/message.py2
-rw-r--r--Lib/test/test_httplib.py4
-rw-r--r--Lib/tkinter/tix.py2
4 files changed, 6 insertions, 5 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index d6dd7ef..b941950 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -850,7 +850,8 @@ class ChainMap(MutableMapping):
to create a single, updateable view.
The underlying mappings are stored in a list. That list is public and can
- accessed or updated using the *maps* attribute. There is no other state.
+ be accessed or updated using the *maps* attribute. There is no other
+ state.
Lookups search the underlying mappings successively until a key is found.
In contrast, writes, updates, and deletions only operate on the first
diff --git a/Lib/email/message.py b/Lib/email/message.py
index a892012..aefaf57 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -710,7 +710,7 @@ class Message:
message, it will be set to "text/plain" and the new parameter and
value will be appended as per RFC 2045.
- An alternate header can specified in the header argument, and all
+ An alternate header can be specified in the header argument, and all
parameters will be quoted as necessary unless requote is False.
If charset is specified, the parameter will be encoded according to RFC
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 7d997b0..329f068 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -255,8 +255,8 @@ class HeaderTests(TestCase):
self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer)
def test_ipv6host_header(self):
- # Default host header on IPv6 transaction should wrapped by [] if
- # its actual IPv6 address
+ # Default host header on IPv6 transaction should be wrapped by [] if
+ # it is an IPv6 address
expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \
b'Accept-Encoding: identity\r\n\r\n'
conn = client.HTTPConnection('[2001::]:81')
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 8a8ab91..f74d48f 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -1048,7 +1048,7 @@ class InputOnly(TixWidget):
class LabelEntry(TixWidget):
"""LabelEntry - Entry field with label. Packages an entry widget
- and a label into one mega widget. It can beused be used to simplify
+ and a label into one mega widget. It can be used be used to simplify
the creation of ``entry-form'' type of interface.
Subwidgets Class