summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* #12072: merge with 3.1.Ezio Melotti2011-05-201-1/+1
|\
| * #12072: add missing parenthesis in the doc. Patch by Sandro Tosi.Ezio Melotti2011-05-201-1/+1
| |
* | test_pydoc: skip PydocServerTest if thread support is disabledVictor Stinner2011-05-201-0/+6
| |
* | (Merge 3.1) Issue #12124: zipimport doesn't keep a reference toVictor Stinner2011-05-193-41/+27
|\ \ | |/ | | | | zlib.decompress() anymore to be able to unload the module.
| * Issue #12124: zipimport doesn't keep a reference to zlib.decompress() anymoreVictor Stinner2011-05-193-41/+26
| | | | | | | | to be able to unload the module.
| * Ooops, add the missing file of the backport of commit 33543b4e0e5d from PythonVictor Stinner2011-05-181-0/+0
| | | | | | | | | | 3.2 (#10801: In zipfile, support different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky.)
| * Backport commit 33543b4e0e5d from Python 3.2: #10801: In zipfile, supportVictor Stinner2011-05-183-4/+36
| | | | | | | | | | different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky.
* | Fix section titleAntoine Pitrou2011-05-181-1/+1
| |
* | Issue #12065: connect_ex() on an SSL socket now returns the original errnoAntoine Pitrou2011-05-183-11/+45
| | | | | | | | when the socket's timeout expires (it used to return None).
* | Issue #12096: Fix a race condition in test_threading.test_waitfor(). PatchVictor Stinner2011-05-172-1/+4
| | | | | | | | written by Charles-François Natali.
* | Fixes #11088: IDLE crashes when using F5 to run a script on OSX with Tk 8.5Ronald Oussoren2011-05-172-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | (merge) Fix #10154 and #10090: locale normalizes the UTF-8 encoding to ↵Ronald Oussoren2011-05-172-1/+4
|\ \ | |/ | | | | | | | | | | | | "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.
| * Fix #10154 and #10090: locale normalizes the UTF-8 encoding to "UTF-8" ↵Ronald Oussoren2011-05-172-1/+4
| | | | | | | | | | | | | | | | 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.
* | (Merge 3.1) Issue #11614: Fix test_linecache, cjkencodings_test.py doesn'tVictor Stinner2011-05-161-1/+1
|\ \ | |/ | | | | exist anymore
| * Issue #11614: Fix test_linecache, cjkencodings_test.py doesn't exist anymoreVictor Stinner2011-05-161-1/+1
| |
* | (Merge 3.1) Issue #11614: Fix importlib tests for the new __hello__ moduleVictor Stinner2011-05-161-9/+17
|\ \ | |/
| * Issue #11614: Fix importlib tests for the new __hello__ moduleVictor Stinner2011-05-161-9/+17
| |
* | (Merge 3.1) Issue #12057: Convert CJK encoding testcase BLOB into multiple textVictor Stinner2011-05-1627-1024/+215
|\ \ | |/ | | | | files
| * Issue #12057: Convert CJK encoding testcase BLOB into multiple text filesVictor Stinner2011-05-1627-1024/+215
| |
* | (Merge 3.1) Issue #11614: import __hello__ prints "Hello World!". Patch writtenVictor Stinner2011-05-164-33/+46
|\ \ | |/ | | | | by Andreas Stührk.
| * Issue #11614: import __hello__ prints "Hello World!". Patch written by AndreasVictor Stinner2011-05-164-31/+44
| | | | | | | | Stührk.
* | Null merge 3.1 (fix already applied: 4a82be47a948+5060a92a8597).Victor Stinner2011-05-150-0/+0
|\ \ | |/
| * Issue #10756: atexit normalizes the exception before displaying it. Patch byVictor Stinner2011-05-153-0/+12
| | | | | | | | | | | | Andreas Stührk. Backport a fix already applied to Python 3.2+ (4a82be47a948 + 5060a92a8597).
* | NEWS entry for fix of issue #9516Ronald Oussoren2011-05-151-0/+3
| |
* | Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set ↵Ronald Oussoren2011-05-156-27/+126
| | | | | | | | | | | | | | | | | | 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.
* | Branch merge.Georg Brandl2011-05-154-9/+13
|\ \
| * \ (Merge 3.1) Issue #12060: Use sig_atomic_t type and volatile keyword in theVictor Stinner2011-05-152-3/+6
| |\ \ | | |/ | | | | | | signal module. Patch written by Charles-François Natali.
| | * Issue #12060: Use sig_atomic_t type and volatile keyword in the signal module.Victor Stinner2011-05-152-3/+6
| | | | | | | | | | | | Patch written by Charles-François Natali.
| * | Merge #6498 fix from 3.1.Georg Brandl2011-05-152-6/+7
| |\ \ | | |/
| | * Closes #6498: fix several misspellings of "SystemExit" as "SystemError".Georg Brandl2011-05-152-6/+7
| | |
* | | Fix-up NEWS: entries made after 3.2.1b1 go into the 3.2.1c1 section.Georg Brandl2011-05-151-44/+65
|/ /
* | Merge: Fix copy-paste mistake in new zlib test.Nadeem Vawda2011-05-141-2/+4
|\ \ | |/
| * Fix copy-paste mistake in new zlib test.Nadeem Vawda2011-05-141-2/+4
| |
* | fix whitespaceGregory P. Smith2011-05-141-1/+1
| |
* | merge headsGregory P. Smith2011-05-143-14/+39
|\ \
| * \ Merge: #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.Nadeem Vawda2011-05-143-14/+39
| |\ \ | | |/ | | | | | | | | | Raise an OverflowError if the input data is too large, instead of silently truncating the input and returning an incorrect result.
| | * Issue #8650: Make zlib.[de]compressobj().[de]compress() 64-bit clean.Nadeem Vawda2011-05-143-14/+39
| | | | | | | | | | | | | | | Raise an OverflowError if the input data is too large, instead of silently truncating the input and returning an incorrect result.
* | | merge heads.Gregory P. Smith2011-05-1425-306/+425
|\ \ \ | |/ /
| * | Merge heads (!)Kurt B. Kaiser2011-05-140-0/+0
| |\ \ | | |/
| | * Merge headsKurt B. Kaiser2011-05-141-30/+99
| | |\
| * | \ Merge headsKurt B. Kaiser2011-05-143-45/+111
| |\ \ \
| | * | | Fix memory leaks in zlib.compress() and .decompress().Nadeem Vawda2011-05-142-14/+12
| | | | | | | | | | | | | | | | | | | | Also, make sure that test_zlib tests decompress() for overly-large inputs.
| | * | | Merged rethought pprint usage example from 3.1.Łukasz Langa2011-05-141-31/+99
| | |\ \ \ | | | | |/ | | | |/|
| | | * | pprint usage example rethought.Łukasz Langa2011-05-141-30/+99
| | | | |
| * | | | Merge from 3.1Kurt B. Kaiser2011-05-142-2/+4
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Issue #6378: Further adjust idle.bat to start associated Python
| | * | Issue #6378: Further adjust idle.bat to start associated PythonKurt B. Kaiser2011-05-142-2/+4
| | |/
| * | Null merge (#8650): zlib.compress() and .decompress() are already 64-bit safe.Nadeem Vawda2011-05-140-0/+0
| |\ \ | | |/
| | * Issue #8650: Backport 64-bit safety fixes for compress() and decompress().Nadeem Vawda2011-05-142-10/+32
| | |
| * | Merge: #12050: zlib.decompressobj().decompress() now clears the unconsumed_tailNadeem Vawda2011-05-143-7/+24
| |\ \ | | |/ | | | | | | attribute when called without a max_length argument.
| | * Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tailNadeem Vawda2011-05-143-7/+24
| | | | | | | | | | | | attribute when called without a max_length argument.