merge heads

This commit is contained in:
Benjamin Peterson 2012-09-29 13:47:47 -04:00
commit 9201214c2c
1 changed files with 38 additions and 15 deletions

View File

@ -1127,7 +1127,7 @@ datetime
corresponding to the :class:`~datetime.datetime` instance. corresponding to the :class:`~datetime.datetime` instance.
* The :meth:`datetime.datetime.strftime` method supports formatting years * The :meth:`datetime.datetime.strftime` method supports formatting years
older than 1000. 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 called without arguments to convert datetime instance to the system
timezone. timezone.
@ -1534,6 +1534,15 @@ sched
:issue:`13245`) :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 shutil
------ ------
@ -1565,7 +1574,6 @@ shutil
in :issue:`4489`.) in :issue:`4489`.)
signal signal
------ ------
@ -1588,14 +1596,27 @@ signal
* :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError, * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
instead of a RuntimeError: OSError has an errno attribute. 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 smtplib
------- -------
The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls` * The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
method now accept an SSLContext parameter to control parameters of the secure method now accept an SSLContext parameter to control parameters of the secure
channel. channel.
(Contributed by Kasun Herath in :issue:`8809`) (Contributed by Kasun Herath in :issue:`8809`)
socket socket
@ -2070,14 +2091,16 @@ Building C extensions
(implemented in :issue:`14040`.) (implemented in :issue:`14040`.)
Other issues Command Line Switch Changes
------------ ---------------------------
.. Issue #11591: When :program:`python` was started with :option:`-S`, * The -Q command-line flag and related artifacts have been removed. Code
``import site`` will not add site-specific paths to the module search checking sys.flags.division_warning will need updating.
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 (:issue:`10998`, contributed by Éric Araujo.)
removed. Code checking sys.flags.division_warning will need updating.
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.)