Commit Graph

49598 Commits

Author SHA1 Message Date
Antoine Pitrou 0d38f2e65f Skip test_smtpnet when ssl is not available 2011-05-18 20:02:50 +02:00
Antoine Pitrou e0cb15ac9d Null merge 2011-05-18 18:58:48 +02:00
Antoine Pitrou f23f786c61 Fix section title 2011-05-18 18:58:09 +02:00
Antoine Pitrou 7a616f2fc5 Issue #12065: connect_ex() on an SSL socket now returns the original errno
when the socket's timeout expires (it used to return None).
2011-05-18 18:52:20 +02:00
Antoine Pitrou b4410dbea6 Issue #12065: connect_ex() on an SSL socket now returns the original errno
when the socket's timeout expires (it used to return None).
2011-05-18 18:51:06 +02:00
Antoine Pitrou cc9ca223d6 Also protect ehlo() and quit() with the transient_internet() context manager 2011-05-18 18:04:04 +02:00
Antoine Pitrou e065020680 Issue #8809: The SMTP_SSL constructor and SMTP.starttls() now support
passing a `context` argument pointing to an ssl.SSLContext instance.
Patch by Kasun Herath.
2011-05-18 18:03:09 +02:00
Victor Stinner ae8856fe36 Ooops, add the missing file of the backport of commit 33543b4e0e5d from Python
3.2 (#10801: In zipfile, support different encodings for the header and the
filenames.  Patch by MvL, test by Eli Bendersky.)
2011-05-18 13:48:41 +02:00
Victor Stinner ff1d2f4cc5 Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, support
different encodings for the header and the filenames.  Patch by MvL, test by
Eli Bendersky.
2011-05-18 13:43:23 +02:00
Victor Stinner 5f3b1c4979 (Merge 3.2) Issue #12096: Fix a race condition in
test_threading.test_waitfor(). Patch written by Charles-François Natali.
2011-05-18 00:20:18 +02:00
Victor Stinner 3349bca46d Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch
written by Charles-François Natali.
2011-05-18 00:16:14 +02:00
Ronald Oussoren 1cb08c3f83 Fixes #11088: IDLE crashes when using F5 to run a script on OSX with Tk 8.5
Without this patch IDLE will crash reliably on OSX when Tkinter
is linked to TkCocoa 8.5.x.

To reproduce:

* Create a new file (script.py) with the following two lines:

x = input('prompt: ')
print(x)

* Save the script

* Run the script using the F5 keyboard shortcut
  (running from the menu works fine)

The patch is a fairly crude hack, but we haven't found a better
workaround for this Tk bug yet.
2011-05-17 14:52:21 +02:00
Ronald Oussoren 2b7ea91e3d Fix for issue 10154, merge from 3.2 2011-05-17 14:49:44 +02:00
Ronald Oussoren 5ee0567bb2 Fixes #11088: IDLE crashes when using F5 to run a script on OSX with Tk 8.5
Without this patch IDLE will crash reliably on OSX when Tkinter
is linked to TkCocoa 8.5.x.

To reproduce:

* Create a new file (script.py) with the following two lines:

x = input('prompt: ')
print(x)

* Save the script

* Run the script using the F5 keyboard shortcut
  (running from the menu works fine)

The patch is a fairly crude hack, but we haven't found a better
workaround for this Tk bug yet.
2011-05-17 14:48:40 +02:00
Ronald Oussoren 6edd8c1faf (merge) Fix #10154 and #10090: locale normalizes the UTF-8 encoding to "UTF-8" instead of "UTF8"
On MacOSX and OpenBSD (and possibly other BSDs) "en_US.UTF-8" is a valid locale
while "en_US.UTF8" is not. As the former works on Linux as well it is better
to normalize to that value.
2011-05-17 13:03:54 +02:00
Ronald Oussoren 02a67ac72b Fix #10154 and #10090: locale normalizes the UTF-8 encoding to "UTF-8" instead of "UTF8"
On MacOSX and OpenBSD (and possibly other BSDs) "en_US.UTF-8" is a valid locale
while "en_US.UTF8" is not. As the former works on Linux as well it is better
to normalize to that value.
2011-05-17 12:44:54 +02:00
Vinay Sajip bd3d5cf96a Skip some tests in the absence of multiprocessing. 2011-05-17 07:41:18 +01:00
Vinay Sajip ce7c978140 Skip some more tests in the absence of threading. 2011-05-17 07:15:53 +01:00
Victor Stinner 362ce37963 (Merge 3.2) Issue #11614: Fix test_linecache, cjkencodings_test.py doesn't
exist anymore
2011-05-16 17:20:47 +02:00
Victor Stinner e5720b989f (Merge 3.1) Issue #11614: Fix test_linecache, cjkencodings_test.py doesn't
exist anymore
2011-05-16 17:20:07 +02:00
Victor Stinner e98f177ca6 Issue #11614: Fix test_linecache, cjkencodings_test.py doesn't exist anymore 2011-05-16 17:18:51 +02:00
Victor Stinner 82f46144cc (Merge 3.2) Issue #11614: Fix importlib tests for the new __hello__ module 2011-05-16 17:00:41 +02:00
Victor Stinner 45323a890a (Merge 3.1) Issue #11614: Fix importlib tests for the new __hello__ module 2011-05-16 16:59:49 +02:00
Victor Stinner 272e24356e Issue #11614: Fix importlib tests for the new __hello__ module 2011-05-16 16:57:18 +02:00
Victor Stinner 651e1a2e63 (Merge 3.2) Issue #12057: Convert CJK encoding testcase BLOB into multiple text
files
2011-05-16 16:50:23 +02:00
Victor Stinner b67cf161bc (Merge 3.1) Issue #12057: Convert CJK encoding testcase BLOB into multiple text
files
2011-05-16 16:45:15 +02:00
Victor Stinner 033a543ab1 Issue #12057: Convert CJK encoding testcase BLOB into multiple text files 2011-05-16 16:43:38 +02:00
Victor Stinner 118ed71afe (Merge 3.2) Issue #11614: import __hello__ prints "Hello World!". Patch written
by Andreas Stührk.
2011-05-16 16:35:35 +02:00
Victor Stinner 9cd6626f3d (Merge 3.1) Issue #11614: import __hello__ prints "Hello World!". Patch written
by Andreas Stührk.
2011-05-16 16:32:33 +02:00
Victor Stinner c77b931196 Issue #11614: import __hello__ prints "Hello World!". Patch written by Andreas
Stührk.
2011-05-16 16:29:35 +02:00
Martin v. Löwis 41972316f5 Add 3.2.1 UUIDs 2011-05-16 07:56:32 +02:00
Gregory P. Smith 3b1f2c35f4 issue #1746656: Fix for OS X. configure and #include changes so that the socket
module compiles again on OS X with its more annoying #include requirements.
2011-05-15 12:18:23 -07:00
Victor Stinner 4d58fdb1a6 Null merge 3.2 (fix already applied: 4a82be47a948+5060a92a8597). 2011-05-15 19:02:34 +02:00
Victor Stinner 83d8a99ac7 Null merge 3.1 (fix already applied: 4a82be47a948+5060a92a8597). 2011-05-15 18:59:29 +02:00
Victor Stinner d0e11ec5b0 Issue #10756: atexit normalizes the exception before displaying it. Patch by
Andreas Stührk.

Backport a fix already applied to Python 3.2+ (4a82be47a948 + 5060a92a8597).
2011-05-15 18:57:44 +02:00
Georg Brandl 7614109501 Added tag v3.2.1rc1 for changeset cfa9364997c7 2011-05-15 17:52:56 +02:00
Georg Brandl 5673e27e72 Bump to 3.2.1rc1. 2011-05-15 17:52:42 +02:00
Georg Brandl 521143dd6c Update pydoc topics and handle suspicious markup. 2011-05-15 17:51:24 +02:00
Ronald Oussoren f4542eb433 (merge from 3.2) Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.
Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.
2011-05-15 17:13:47 +02:00
Ronald Oussoren 447fcfb0b4 NEWS entry for fix of issue #9516 2011-05-15 16:50:28 +02:00
Ronald Oussoren 222e89a598 Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.
Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.
2011-05-15 16:46:11 +02:00
Nadeem Vawda d74b5936a1 Fix _socket compilation failures on non-Linux buildbots (cf. issue #1746656). 2011-05-15 13:16:22 +02:00
Georg Brandl 2bff9fcec2 Branch merge. 2011-05-15 10:42:56 +02:00
Victor Stinner aedb2823fd (Merge 3.2) Issue #12060: Use sig_atomic_t type and volatile keyword in the
signal module. Patch written by Charles-François Natali.
2011-05-15 10:27:49 +02:00
Victor Stinner 5ebfe6d9a9 (Merge 3.1) Issue #12060: Use sig_atomic_t type and volatile keyword in the
signal module. Patch written by Charles-François Natali.
2011-05-15 10:27:09 +02:00
Victor Stinner 2ec6b176bd Issue #12060: Use sig_atomic_t type and volatile keyword in the signal module.
Patch written by Charles-François Natali.
2011-05-15 10:21:59 +02:00
Georg Brandl 758b85e9d4 Fix-up NEWS: entries made after 3.2.1b1 go into the 3.2.1c1 section. 2011-05-15 09:49:19 +02:00
Gregory P. Smith 5ed2e779f1 Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname
methods to the socket module.
2011-05-15 00:26:45 -07:00
Georg Brandl 1a4de20d95 Merge #6498 fix from 3.2. 2011-05-15 08:49:38 +02:00
Georg Brandl 318e62153b Merge #6498 fix from 3.1. 2011-05-15 08:49:29 +02:00