Commit graph

49881 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Georg Brandl
2bff9fcec2 Branch merge. 2011-05-15 10:42:56 +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
Georg Brandl
318e62153b Merge #6498 fix from 3.1. 2011-05-15 08:49:29 +02:00
Georg Brandl
0b2489e986 Closes #6498: fix several misspellings of "SystemExit" as "SystemError". 2011-05-15 08:49:12 +02:00
Nadeem Vawda
760155cc52 Merge: Fix copy-paste mistake in new zlib test. 2011-05-15 00:48:57 +02:00
Nadeem Vawda
1161a9ca40 Fix copy-paste mistake in new zlib test. 2011-05-15 00:48:24 +02:00
Gregory P. Smith
a3221f8209 fix whitespace 2011-05-14 15:35:19 -07:00
Gregory P. Smith
11ddc999e0 merge heads 2011-05-14 15:33:43 -07:00
Gregory P. Smith
873cab2890 merge heads. 2011-05-14 15:26:35 -07:00
Nadeem Vawda
565d659dcd Merge: #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result.
2011-05-15 00:20:52 +02:00
Nadeem Vawda
0c3d96ae1d Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.
Raise an OverflowError if the input data is too large, instead of silently
truncating the input and returning an incorrect result.
2011-05-15 00:19:50 +02:00
Gregory P. Smith
12c9d028ed Fixes Issue #12059: Properly handle missing hash functions even when
the expected builtin modules are not present.

This includes a unittest for __get_builtin_constructor() in the face
of such an error.
2011-05-14 15:15:49 -07:00
Kurt B. Kaiser
95e686686f Merge heads (!) 2011-05-14 17:50:02 -04:00
Kurt B. Kaiser
4b16ff2c44 Merge heads 2011-05-14 17:31:54 -04:00
Kurt B. Kaiser
84aacf8912 Merge heads 2011-05-14 17:30:58 -04:00
Kurt B. Kaiser
f369b8152d Merge from 3.1
Issue #6378: Further adjust idle.bat to start associated Python
2011-05-14 17:22:14 -04:00
Kurt B. Kaiser
dfbe1592db Issue #6378: Further adjust idle.bat to start associated Python 2011-05-14 17:20:09 -04:00
Nadeem Vawda
154bdf92fc Fix memory leaks in zlib.compress() and .decompress().
Also, make sure that test_zlib tests decompress() for overly-large inputs.
2011-05-14 23:07:36 +02:00
Łukasz Langa
d8eab60c00 Merged rethought pprint usage example from 3.1. 2011-05-14 22:49:10 +02:00
Łukasz Langa
4ad78ab766 pprint usage example rethought. 2011-05-14 22:43:44 +02:00
Nadeem Vawda
855cd7ad29 Null merge (#8650): zlib.compress() and .decompress() are already 64-bit safe. 2011-05-14 22:32:19 +02:00
Nadeem Vawda
1b8a417d9f Issue #8650: Backport 64-bit safety fixes for compress() and decompress(). 2011-05-14 22:26:55 +02:00
Nadeem Vawda
5eef502de0 Merge: #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
attribute when called without a max_length argument.
2011-05-14 14:15:47 +02:00
Nadeem Vawda
7619e88adb Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tail
attribute when called without a max_length argument.
2011-05-14 14:05:20 +02:00
Ezio Melotti
07352b084c Update __all__ and docstring. 2011-05-14 14:51:18 +03:00