[Python-checkins] cpython (merge default -> default): merge heads

benjamin.peterson python-checkins at python.org
Sat Sep 29 19:48:03 CEST 2012


http://hg.python.org/cpython/rev/43c8701988dd
changeset:   79256:43c8701988dd
parent:      79255:dfe991036531
parent:      79254:f11649b21603
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 29 13:47:47 2012 -0400
summary:
  merge heads

files:
  Doc/whatsnew/3.3.rst |  59 ++++++++++++++++++++++---------
  1 files changed, 41 insertions(+), 18 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1127,7 +1127,7 @@
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
    older than 1000.
- * XXX The :meth:`datetime.datetime.astimezone` method can now be
+ * The :meth:`datetime.datetime.astimezone` method can now be
    called without arguments to convert datetime instance to the system
    timezone.
 
@@ -1534,6 +1534,15 @@
   :issue:`13245`)
 
 
+shlex
+-----
+
+* The previously undocumented helper function ``quote`` from the
+  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
+  documented.  :func:`~shlex.quote` properly escapes all characters in a string
+  that might be otherwise given special meaning by the shell.
+
+
 shutil
 ------
 
@@ -1565,7 +1574,6 @@
   in :issue:`4489`.)
 
 
-
 signal
 ------
 
@@ -1588,14 +1596,27 @@
 * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
   instead of a RuntimeError: OSError has an errno attribute.
 
+
+smtpd
+-----
+
+* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+  (size extension).  Per the standard, these extensions are enabled if and only
+  if the client initiates the session with an ``EHLO`` command.
+
+  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+  Jauhiainen.  Substantial additional work on the patch contributed by Michele
+  Orrù and Dan Boswell.  :issue:`8739`)
+
+
 smtplib
 -------
 
-The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-method now accept an SSLContext parameter to control parameters of the secure
-channel.
-
-(Contributed by Kasun Herath in :issue:`8809`)
+* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+  method now accept an SSLContext parameter to control parameters of the secure
+  channel.
+
+  (Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -2070,14 +2091,16 @@
   (implemented in :issue:`14040`.)
 
 
-Other issues
-------------
-
-.. Issue #11591: When :program:`python` was started with :option:`-S`,
-   ``import site`` will not add site-specific paths to the module search
-   paths.  In previous versions, it did.  See changeset for doc changes in
-   various files.  Contributed by Carl Meyer with editions by Éric Araujo.
-
-.. Issue #10998: the -Q command-line flag and related artifacts have been
-   removed.  Code checking sys.flags.division_warning will need updating.
-   Contributed by Éric Araujo.
+Command Line Switch Changes
+---------------------------
+
+* The -Q command-line flag and related artifacts have been removed.  Code
+  checking sys.flags.division_warning will need updating.
+
+  (:issue:`10998`, contributed by Éric Araujo.)
+
+* When :program:`python` is started with :option:`-S`, ``import site``
+  will no longer add site-specific paths to the module search paths.  In
+  previous versions, it did.
+
+  (:issue:`11591`, contributed by Carl Meyer with editions by Éric Araujo.)

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


More information about the Python-checkins mailing list