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

Tue Mar 15 20:52:45 CET 2011

http://hg.python.org/cpython/rev/24b00853cb90
changeset: 68523:24b00853cb90
parent: 68521:d71476b9a55d
parent: 68516:7523fb0410f2
user: Gregory P. Smith <greg at krypto.org>
date: Tue Mar 15 15:35:27 2011 -0400
summary:
 merge update
files:

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -537,9 +537,10 @@
 operations such as ``PyEval_ReleaseThread(tstate)``. It is not needed before
 calling :c:func:`PyEval_SaveThread` or :c:func:`PyEval_RestoreThread`.
 
- .. index:: single: Py_Initialize()
+ This is a no-op when called for a second time.
 
- This is a no-op when called for a second time.
+ .. versionchanged:: 3.2
+ This function cannot be called before :c:func:`Py_Initialize()` anymore.
 
 .. index:: module: _thread
 
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -46,15 +46,16 @@
 be generated or modified).
 
 Note that this method is provided as a convenience and may not always
- format the message the way you want. For example, by default it mangles
- lines that begin with ``From``. For more flexibility, instantiate a
+ format the message the way you want. For example, by default it does
+ not do the mangling of lines that begin with ``From`` that is
+ required by the unix mbox format. For more flexibility, instantiate a
 :class:`~email.generator.Generator` instance and use its :meth:`flatten`
 method directly. For example::
 
 from io import StringIO
 from email.generator import Generator
 fp = StringIO()
- g = Generator(fp, mangle_from_=False, maxheaderlen=60)
+ g = Generator(fp, mangle_from_=True, maxheaderlen=60)
 g.flatten(msg)
 text = fp.getvalue()
 
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -34,6 +34,20 @@
 For normal use, you should only require the initialization/connect,
 :meth:`sendmail`, and :meth:`quit` methods. An example is included below.
 
+ The :class:`SMTP` class supports the :keyword:`with` statement. When used
+ like this, the SMTP ``QUIT`` command is issued automatically when the
+ :keyword:`with` statement exits. E.g.::
+
+ >>> from smtplib import SMTP
+ >>> with SMTP("domain.org") as smtp:
+ ... smtp.noop()
+ ...
+ (250, b'Ok')
+ >>>
+
+ .. versionadded:: 3.3
+ Support for the :keyword:`with` statement was added.
+
 
 .. class:: SMTP_SSL(host='', port=0, local_hostname=None, keyfile=None, certfile=None[, timeout])
 
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
@@ -2698,3 +2698,7 @@
 a new function, :func:`asyncore.handle_accepted`, was added to replace it.
 
 (Contributed by Giampaolo Rodola in :issue:`6706`.)
+
+* Due to the new :term:`GIL` implementation, :c:func:`PyEval_InitThreads()`
+ cannot be called before :c:func:`Py_Initialize()` anymore.
+
diff --git a/Lib/email/message.py b/Lib/email/message.py
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -157,8 +157,7 @@
 header.
 
 This is a convenience method and may not generate the message exactly
- as you intend because by default it mangles lines that begin with
- "From ". For more flexibility, use the flatten() method of a
+ as you intend. For more flexibility, use the flatten() method of a
 Generator instance.
 """
 from email.generator import Generator
@@ -242,7 +241,7 @@
 raise TypeError('Expected list, got %s' % type(self._payload))
 payload = self._payload
 cte = self.get('content-transfer-encoding', '').lower()
- # payload can be bytes here, (I wonder if that is actually a bug?)
+ # payload may be bytes here.
 if isinstance(payload, str):
 if _has_surrogates(payload):
 bpayload = payload.encode('ascii', 'surrogateescape')
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -269,6 +269,19 @@
 pass
 self.local_hostname = '[%s]' % addr
 
+ def __enter__(self):
+ return self
+
+ def __exit__(self, *args):
+ try:
+ code, message = self.docmd("QUIT")
+ if code != 221:
+ raise SMTPResponseException(code, message)
+ except SMTPServerDisconnected:
+ pass
+ finally:
+ self.close()
+
 def set_debuglevel(self, debuglevel):
 """Set the debug output level.
 
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -424,6 +424,9 @@
 # Simulated SMTP channel & server
 class SimSMTPChannel(smtpd.SMTPChannel):
 
+ # For testing failures in QUIT when using the context manager API.
+ quit_response = None
+
 def __init__(self, extra_features, *args, **kw):
 self._extrafeatures = ''.join(
 [ "250-{0}\r\n".format(x) for x in extra_features ])
@@ -475,19 +478,31 @@
 else:
 self.push('550 No access for you!')
 
+ def smtp_QUIT(self, arg):
+ # args is ignored
+ if self.quit_response is None:
+ super(SimSMTPChannel, self).smtp_QUIT(arg)
+ else:
+ self.push(self.quit_response)
+ self.close_when_done()
+
 def handle_error(self):
 raise
 
 
 class SimSMTPServer(smtpd.SMTPServer):
 
+ # For testing failures in QUIT when using the context manager API.
+ quit_response = None
+
 def __init__(self, *args, **kw):
 self._extra_features = []
 smtpd.SMTPServer.__init__(self, *args, **kw)
 
 def handle_accepted(self, conn, addr):
- self._SMTPchannel = SimSMTPChannel(self._extra_features,
- self, conn, addr)
+ self._SMTPchannel = SimSMTPChannel(
+ self._extra_features, self, conn, addr)
+ self._SMTPchannel.quit_response = self.quit_response
 
 def process_message(self, peer, mailfrom, rcpttos, data):
 pass
@@ -620,6 +635,25 @@
 self.assertIn(sim_auth_credentials['cram-md5'], str(err))
 smtp.close()
 
+ def test_with_statement(self):
+ with smtplib.SMTP(HOST, self.port) as smtp:
+ code, message = smtp.noop()
+ self.assertEqual(code, 250)
+ self.assertRaises(smtplib.SMTPServerDisconnected, smtp.send, b'foo')
+ with smtplib.SMTP(HOST, self.port) as smtp:
+ smtp.close()
+ self.assertRaises(smtplib.SMTPServerDisconnected, smtp.send, b'foo')
+
+ def test_with_statement_QUIT_failure(self):
+ self.serv.quit_response = '421 QUIT FAILED'
+ with self.assertRaises(smtplib.SMTPResponseException) as error:
+ with smtplib.SMTP(HOST, self.port) as smtp:
+ smtp.noop()
+ self.assertEqual(error.exception.smtp_code, 421)
+ self.assertEqual(error.exception.smtp_error, b'QUIT FAILED')
+ # We don't need to clean up self.serv.quit_response because a new
+ # server is always instantiated in the setUp().
+
 #TODO: add tests for correct AUTH method fallback now that the
 #test infrastructure can support it.
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,9 @@
 Library
 -------
 
+- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used
+ in a `with` statement. Contributed by Giampaolo Rodola.
+
 - Issue #11554: Fixed support for Japanese codecs; previously the body output
 encoding was not done if euc-jp or shift-jis was specified as the charset.
 
diff --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog
--- a/Modules/_ctypes/libffi/ChangeLog
+++ b/Modules/_ctypes/libffi/ChangeLog
@@ -3084,7 +3084,7 @@
 
 2003年09月18日 Kaz Kojima <kkojima at gcc.gnu.org>
 
-	* src/sh/ffi.c (ffi_prep_args): Take account into the alignment
+	* src/sh/ffi.c (ffi_prep_args): Take account into the alignement
 	for the register size.
 	(ffi_closure_helper_SYSV): Handle the structure return value
 	address correctly.
@@ -3344,7 +3344,7 @@
 2003年02月06日 Andreas Tobler <a.tobler at schweiz.ch>
 
 	* libffi/src/powerpc/darwin_closure.S:
-	Fix alignment bug, allocate 8 bytes for the result.
+	Fix alignement bug, allocate 8 bytes for the result.
 	* libffi/src/powerpc/aix_closure.S:
 	Likewise.
 	* libffi/src/powerpc/ffi_darwin.c:
diff --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c
--- a/Modules/_ctypes/libffi/src/dlmalloc.c
+++ b/Modules/_ctypes/libffi/src/dlmalloc.c
@@ -1326,7 +1326,7 @@
 return (ptr != 0)? ptr: MFAIL;
 }
 
-/* This function supports releasing coalesced segments */
+/* This function supports releasing coalesed segments */
 static int win32munmap(void* ptr, size_t size) {
 MEMORY_BASIC_INFORMATION minfo;
 char* cptr = ptr;
@@ -1362,7 +1362,7 @@
 #define CALL_MORECORE(S) MFAIL
 #endif /* HAVE_MORECORE */
 
-/* mstate bit set if contiguous morecore disabled or failed */
+/* mstate bit set if continguous morecore disabled or failed */
 #define USE_NONCONTIGUOUS_BIT (4U)
 
 /* segment bit set in create_mspace_with_base */
diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
--- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
+++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
@@ -592,7 +592,7 @@
 		 +---------------------------------------+ 160
 		 | result area 8 |
 		 +---------------------------------------+ 168
-		 | alignment to the next multiple of 16 |
+		 | alignement to the next multiple of 16 |
 SP current --> +---------------------------------------+ 176 <- parent frame
 		 | back chain to caller 4 |
 		 +---------------------------------------+ 180
diff --git a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
--- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
+++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
@@ -650,7 +650,7 @@
 		 +---------------------------------------+ 160
 		 | result area 8 |
 		 +---------------------------------------+ 168
-		 | alignment to the next multiple of 16 |
+		 | alignement to the next multiple of 16 |
 SP current --> +---------------------------------------+ 176 <- parent frame
 		 | back chain to caller 4 |
 		 +---------------------------------------+ 180
-- 
Repository URL: http://hg.python.org/cpython
