[Python-checkins] cpython (merge 3.5 -> default): Issue #27430: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/97b22fe37af1
changeset:   102239:97b22fe37af1
parent:      102237:83b1f672cd6e
parent:      102238:ab6129af2a5c
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Fri Jul 01 12:17:45 2016 +0300
summary:
  Issue #27430: Merge from 3.5

files:
  Doc/whatsnew/3.2.rst           |  2 +-
  Lib/smtplib.py                 |  2 +-
  Lib/unittest/test/test_case.py |  2 +-
  Misc/NEWS                      |  2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2666,7 +2666,7 @@
 
 * The :class:`xml.etree.ElementTree` class now raises an
   :exc:`xml.etree.ElementTree.ParseError` when a parse fails. Previously it
-  raised a :exc:`xml.parsers.expat.ExpatError`.
+  raised an :exc:`xml.parsers.expat.ExpatError`.
 
 * The new, longer :func:`str` value on floats may break doctests which rely on
   the old output format.
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -900,7 +900,7 @@
         the recipient addresses contain non-ASCII and the server advertises the
         SMTPUTF8 capability, the policy is cloned with utf8 set to True for the
         serialization, and SMTPUTF8 and BODY=8BITMIME are asserted on the send.
-        If the server does not support SMTPUTF8, an SMPTNotSupported error is
+        If the server does not support SMTPUTF8, an SMTPNotSupported error is
         raised.  Otherwise the generator is called without modifying the
         policy.
 
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -339,7 +339,7 @@
         self._check_call_order__subtests(result, events, expected)
 
     def test_run_call_order__subtests_legacy(self):
-        # With a legacy result object (without a addSubTest method),
+        # With a legacy result object (without an addSubTest method),
         # text execution stops after the first subtest failure.
         events = []
         result = LegacyLoggingResult(events)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -193,7 +193,7 @@
 
 - Issue #26556: Update expat to 2.1.1, fixes CVE-2015-1283.
 
-- Fix TLS stripping vulnerability in smptlib, CVE-2016-0772.  Reported by Team
+- Fix TLS stripping vulnerability in smtplib, CVE-2016-0772.  Reported by Team
   Oststrom
 
 - Issue #21386: Implement missing IPv4Address.is_global property.  It was

-- 
Repository URL: https://hg.python.org/cpython