summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge 3.2Benjamin Peterson2012-03-131-7/+7
|\
| * merge headsBenjamin Peterson2012-03-132-8/+15
| |\
| * | fix indentationBenjamin Peterson2012-03-131-7/+7
| | |
* | | Issue #3835: Refuse to use unthreaded Tcl in threaded Python.Martin v. Löwis2012-03-132-0/+9
| | | | | | | | | | | | Patch by Guilherme Polo and Andrew Svetlov.
* | | Issue #2843: Add new Tk API to Tkinter.Martin v. Löwis2012-03-132-1/+89
| | | | | | | | | | | | Patch by Guilherme Polo and Andrew Svetlov.
* | | Issue #14184: mergeNed Deily2012-03-132-8/+15
|\ \ \ | | |/ | |/|
| * | Issue #14184: Increase the default stack size for secondary threads onNed Deily2012-03-132-8/+15
| |/ | | | | | | Mac OS X to prevent interpreter crashes when compiled on 10.7.
| * Merged upstream change.Vinay Sajip2012-03-131-0/+5
| |\
* | | Issue #14180: Fix an invalid rounding when compiler optimization are enabledVictor Stinner2012-03-131-1/+3
| | | | | | | | | | | | Use volatile keyword to disable localy unsafe float optimizations.
* | | Issue #14180: Fix pythoncore.vcproj, Modules/_time.[ch] have been removedVictor Stinner2012-03-131-8/+0
| | |
* | | Issue #14180: Fix another typo in kqueue_queue_control()Victor Stinner2012-03-131-1/+1
| | |
* | | Issue #14180: Fix select.select() compilation on BSD and a typo in ↵Victor Stinner2012-03-131-2/+4
| | | | | | | | | | | | kqueue_queue_control()
* | | Issue #14180: Remove commented codeVictor Stinner2012-03-131-2/+0
| | |
* | | Close #14180: Factorize code to convert a number of seconds to time_t, ↵Victor Stinner2012-03-1316-221/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeval or timespec time.ctime(), gmtime(), time.localtime(), datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of a ValueError, if the timestamp does not fit in time_t. datetime.datetime.fromtimestamp() and datetime.datetime.utcfromtimestamp() now round microseconds towards zero instead of rounding to nearest with ties going away from zero.
* | | Merged upstream change.Vinay Sajip2012-03-131-0/+5
|\ \ \
| * \ \ merge to 3.3 - Fix closes Issue14281 - Test for cgi.escape by Brian LandersSenthil Kumaran2012-03-131-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | 3.2 - Fix closes Issue14281 - Test for cgi.escape by Brian LandersSenthil Kumaran2012-03-131-0/+5
| | | |
* | | | Closes #14267: Merged fix from 3.2.Vinay Sajip2012-03-131-6/+15
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Closes #14267: Corrected computation of rollover filename.Vinay Sajip2012-03-131-6/+15
| |/
| * merge headsSenthil Kumaran2012-03-132-4/+11
| |\
| * \ merge headsSenthil Kumaran2012-03-136-29/+177
| |\ \
* | \ \ merge headsSenthil Kumaran2012-03-132-4/+11
|\ \ \ \
| * \ \ \ MergeMichael Foord2012-03-132-4/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix unittest test discovery for JythonMichael Foord2012-03-132-4/+11
| | | |/ | | |/|
* | | | merge headsSenthil Kumaran2012-03-1321-121/+546
|\ \ \ \ | |/ / /
| * | | #8942: add test for __path__ contents in zipimport testsR David Murray2012-03-131-0/+4
| | | | | | | | | | | | | | | | Patch by Tatiana Al-Chueyr.
| * | | Issue #1178863: Separate initialisation from setting when initializingMartin v. Löwis2012-03-133-12/+193
| | | | | | | | | | | | | | | | | | | | | | | | Tkinter.Variables; harmonize exceptions to ValueError; only delete variables that have not been deleted; assert that variable names are strings Patch by Andrew Svetlov.
| * | | closes #14259 re.finditer() now takes keyword arguments: pos, endpos.Sean Reifschneider2012-03-133-7/+32
| | | | | | | | | | | | | | | | | | | | Contrary to the documentation, finditer() did not take pos and endpos keyword arguments.
| * | | Try to fix compilation of Python-ast.c on Visual Studio 2008Victor Stinner2012-03-132-2/+2
| | | |
| * | | #14179: merge with 3.2.Ezio Melotti2012-03-122-0/+11
| |\ \ \ | | |/ /
| | * | #14179: add tests for re.compile. Patch by Florian Mladitsch.Ezio Melotti2012-03-122-0/+11
| | | |
| * | | Issue #14104: Implement time.monotonic() on Mac OS X,Victor Stinner2012-03-122-1/+20
| | | | | | | | | | | | | | | | patch written by Nicholas Riley.
| * | | minor PEP7-related fixŁukasz Langa2012-03-121-2/+2
| | | |
| * | | Merge heads.Eric V. Smith2012-03-122-6/+10
| |\ \ \
| | * \ \ str.format_map tests don't do what they say: fix to actually implement the ↵Eric V. Smith2012-03-122-6/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | intent of the test. Closes #13450. Patch by Akira Li.
| | | * | Merge heads.Eric V. Smith2012-03-123-23/+156
| | | |\ \
| | | * | | str.format_map tests don't do what they say: fix to actually implement the ↵Eric V. Smith2012-03-122-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | intent of the test. Closes #13450.
| * | | | | MergeMichael Foord2012-03-124-18/+165
| |\ \ \ \ \ | | |/ / / /
| | * | | | Head mergeŁukasz Langa2012-03-121-3/+8
| | |\ \ \ \
| | | * | | | #13842: check whether PyUnicode_FromString succeededŁukasz Langa2012-03-121-3/+8
| | | | | | |
| | * | | | | #13394: add more tests for the aifc module and use warnings.warn instead of ↵Ezio Melotti2012-03-123-15/+157
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| | print. Patch by Oleg Plakhotnyuk.
| | | * | | #13394: add more tests for the aifc module. Patch by Oleg Plakhotnyuk.Ezio Melotti2012-03-121-9/+154
| | | | | |
| * | | | | Move adding unittest test discovery command line options into their own method.Michael Foord2012-03-121-5/+7
| |/ / / /
| * | | | MergeMichael Foord2012-03-125-1/+43
| |\ \ \ \
| | * \ \ \ Head merge.Łukasz Langa2012-03-124-0/+42
| | |\ \ \ \
| | | * | | | Fixes #13842: cannot pickle Ellipsis or NotImplemented.Łukasz Langa2012-03-124-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks for James Sanders for the bug report and the patch.
| | * | | | | adjust for change in AST typeBenjamin Peterson2012-03-121-1/+1
| | | | | | |
| * | | | | | Refactor unittest command line handling to always use optparseMichael Foord2012-03-122-59/+32
| |/ / / / /
| * | | | | merge 3.2Benjamin Peterson2012-03-121-6/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | kill this disabled codeBenjamin Peterson2012-03-121-6/+0
| | | | | |