summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Close #14180: Factorize code to convert a number of seconds to time_t, timeva...Victor Stinner2012-03-1316-221/+277
* 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
| * | | Issue #1178863: Separate initialisation from setting when initializingMartin v. Löwis2012-03-133-12/+193
| * | | closes #14259 re.finditer() now takes keyword arguments: pos, endpos.Sean Reifschneider2012-03-133-7/+32
| * | | 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
| * | | 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 in...Eric V. Smith2012-03-122-6/+10
| | |\ \ \ | | | |/ /
| | | * | Merge heads.Eric V. Smith2012-03-123-23/+156
| | | |\ \
| | | * | | str.format_map tests don't do what they say: fix to actually implement the in...Eric V. Smith2012-03-122-6/+10
| * | | | | 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 p...Ezio Melotti2012-03-123-15/+157
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | #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
| | * | | | | 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
| * | | | | merge 3.2Benjamin Peterson2012-03-121-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | use correct naming conventionBenjamin Peterson2012-03-121-2/+2
| * | | | | give the AST class a __dict__Benjamin Peterson2012-03-124-6/+35
| * | | | | merge 3.2Benjamin Peterson2012-03-121-3/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | allow AST objects to be like its subclassesBenjamin Peterson2012-03-121-3/+0
| * | | | | merge headsBenjamin Peterson2012-03-122-3/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | merge 3.2Benjamin Peterson2012-03-122-4/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | merge headsBenjamin Peterson2012-03-121-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | every other ast object has a dict, so I think AST should, tooBenjamin Peterson2012-03-121-3/+0
* | | | | | closes issue14257 - Grammatical fixSenthil Kumaran2012-03-121-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | closes issue14257 - Grammatical fixSenthil Kumaran2012-03-121-3/+3
| | |_|/ | |/| |
* | | | Merge.Eric V. Smith2012-03-122-3/+8
|\ \ \ \
| * | | | Make test_logging no longer fail if zlib not present. Closes #14256. Patch by...Eric V. Smith2012-03-122-3/+8
| | |/ / | |/| |