Merge: whatsnew updates for smtplib and collections.Counter.

bitdancer · bitdancer · commit 3dc23d4bf245 · 2012-10-06T16:30:46.000-04:00
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
@@ -1005,20 +1005,20 @@ collections
 -----------
 
 Addition of a new :class:`~collections.ChainMap` class to allow treating a
-number of mappings as a single unit.
-
-(Written by Raymond Hettinger for :issue:`11089`, made public in
-:issue:`11297`)
+number of mappings as a single unit.  (Written by Raymond Hettinger for
+:issue:`11089`, made public in :issue:`11297`)
 
 The abstract base classes have been moved in a new :mod:`collections.abc`
 module, to better differentiate between the abstract and the concrete
 collections classes.  Aliases for ABCs are still present in the
-:mod:`collections` module to preserve existing imports.
-
-(:issue:`11085`)
+:mod:`collections` module to preserve existing imports.  (:issue:`11085`)
 
 .. XXX addition of __slots__ to ABCs not recorded here: internal detail
 
+The :class:`~collections.Counter` class now supports the unary ``+`` and ``-``
+operators, as well as the in-place operators ``+=``, ``-=``, ``|=``, and
+``&=``.  (Contributed by Raymond Hettinger in :issue:`13121`.)
+
 
 contextlib
 ----------
@@ -1806,6 +1806,12 @@ Orrù and Dan Boswell.  :issue:`8739`)
 smtplib
 -------
 
+The :class:`~smtplib.SMTP`, :class:`~smtplib.SMTP_SSL`, and
+:class:`~smtplib.LMTP` classes now accept a ``source_address`` keyword argument
+to specify the ``(host, port)`` to use as the source address in the bind call
+when creating the outgoing socket.  (Contributed by Paulo Scardine in
+:issue:`11281`.)
+
 :class:`~smtplib.SMTP` now supports the context manager protocol, allowing an
 ``SMTP`` instance to be used in a ``with`` statement.  (Contributed
 by Giampaolo Rodolà in :issue:`11289`.)
diff --git a/Misc/HISTORY b/Misc/HISTORY
@@ -2881,8 +2881,9 @@ Library
 - Issue #12540: Prevent zombie IDLE processes on Windows due to changes
   in os.kill().
 
-- Add support for unary plus and unary minus to collections.Counter().
-  Issue #13121: Also add support for inplace math operators.
+- Issue #13121: add support for inplace math operators to collections.Counter.
+
+- Add support for unary plus and unary minus to collections.Counter.
 
 - Issue #12683: urlparse updated to include svn as schemes that uses relative
   paths. (svn from 1.5 onwards support relative path).
