diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-02-10 01:18:36 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-02-10 01:18:36 +0000 |
| commit | 263c448a2e57378aee775e9a994ab87946233160 (patch) | |
| tree | 17b747db4ffe85f66514a2d13e337ae681d24cf1 /Lib | |
| parent | 15a3095d64e96d0fe7448270f2c5b0bf22f9c4e1 (diff) | |
| parent | 96a4f07107476c0038ff1302b7ef779cab07e8ae (diff) | |
| download | cpython-git-263c448a2e57378aee775e9a994ab87946233160.tar.gz | |
Issues #26310, 26311: Merge typo fixes from 3.5
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/headerregistry.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 2 | ||||
| -rw-r--r-- | Lib/idlelib/help.py | 2 | ||||
| -rw-r--r-- | Lib/socketserver.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Lib/email/headerregistry.py b/Lib/email/headerregistry.py index 468ca9e3a0..4e142ee8dc 100644 --- a/Lib/email/headerregistry.py +++ b/Lib/email/headerregistry.py @@ -16,7 +16,7 @@ from email import _header_value_parser as parser class Address: def __init__(self, display_name='', username='', domain='', addr_spec=None): - """Create an object represeting a full email address. + """Create an object representing a full email address. An address can have a 'display_name', a 'username', and a 'domain'. In addition to specifying the username and domain separately, they may be diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index ce6e3a4e75..d914b2cc44 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -149,7 +149,7 @@ What's New in IDLE 3.5.0? move version to end. - Issue #14105: Idle debugger breakpoints no longer disappear - when inseting or deleting lines. + when inserting or deleting lines. - Issue #17172: Turtledemo can now be run from Idle. Currently, the entry is on the Help menu, but it may move to Run. diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py index b31596c2eb..24665a82e4 100644 --- a/Lib/idlelib/help.py +++ b/Lib/idlelib/help.py @@ -11,7 +11,7 @@ Help => IDLE Help: Display help.html with proper formatting. Doc/library/idle.rst (Sphinx)=> Doc/build/html/library/idle.html (help.copy_strip)=> Lib/idlelib/help.html -HelpParser - Parse help.html and and render to tk Text. +HelpParser - Parse help.html and render to tk Text. HelpText - Display formatted help.html. diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 0ce8e81065..e16aca519e 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -671,7 +671,7 @@ class BaseRequestHandler: client address as self.client_address, and the server (in case it needs access to per-server information) as self.server. Since a separate instance is created for each request, the handle() method - can define arbitrary other instance variariables. + can define other arbitrary instance variables. """ |