summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge heads (!)Kurt B. Kaiser2011-05-140-0/+0
| |\ \ \ | | |/ /
| | * | Merge headsKurt B. Kaiser2011-05-141-30/+99
| | |\ \
* | | \ \ Merge from 3.2Kurt B. Kaiser2011-05-142-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge headsKurt B. Kaiser2011-05-143-45/+111
| |\ \ \ \
| * \ \ \ \ Merge from 3.1Kurt B. Kaiser2011-05-142-2/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Issue #6378: Further adjust idle.bat to start associated PythonKurt B. Kaiser2011-05-142-2/+4
* | | | | | Merge fix for memory leaks in zlib.compress() and .decompress().Nadeem Vawda2011-05-142-14/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix memory leaks in zlib.compress() and .decompress().Nadeem Vawda2011-05-142-14/+12
* | | | | | Merged rethought pprint example from 3.2.Łukasz Langa2011-05-141-31/+99
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merged rethought pprint usage example from 3.1.Łukasz Langa2011-05-141-31/+99
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | pprint usage example rethought.Łukasz Langa2011-05-141-30/+99
| | |/ /
* | | | Null merge (#8650): zlib.compress() and .decompress() are already 64-bit safe.Nadeem Vawda2011-05-140-0/+0
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
| * | | Merge: #12050: zlib.decompressobj().decompress() now clears the unconsumed_tailNadeem Vawda2011-05-143-7/+24
| |\ \ \ | | |/ /
| | * | Issue #12050: zlib.decompressobj().decompress() now clears the unconsumed_tailNadeem Vawda2011-05-143-7/+24
* | | | Merge with 3.2 and also remove captured_output from __all__ (see #7960).Ezio Melotti2011-05-141-3/+4
|\ \ \ \ | |/ / /
| * | | Update __all__ and docstring.Ezio Melotti2011-05-141-1/+3
* | | | Skip test in test_fileinput when zlib is missing.Ezio Melotti2011-05-141-1/+5
* | | | #11979: merge with 3.2.Ezio Melotti2011-05-141-16/+17
|\ \ \ \ | |/ / /
| * | | #11979: merge with 3.1.Ezio Melotti2011-05-141-16/+17
| |\ \ \ | | |/ /
| | * | #11979: improve wording and markup in sockets howto. Patch by Xavier Morel.Ezio Melotti2011-05-141-16/+17
* | | | #7960: merge with 3.2.Ezio Melotti2011-05-141-8/+8
|\ \ \ \ | |/ / /
| * | | #7960: merge with 3.1.Ezio Melotti2011-05-141-8/+8
| |\ \ \ | | |/ /
| | * | #7960: fix docstrings for captured_output and captured_stdout.Ezio Melotti2011-05-141-8/+8
| | * | #5723: Improve json tests to be executed with and without accelerations.Ezio Melotti2011-05-1419-195/+249
* | | | #5723: merge with 3.2.Ezio Melotti2011-05-1419-218/+253
|\ \ \ \ | |/ / /
| * | | #5723: merge with 3.1.Ezio Melotti2011-05-1419-218/+253
* | | | Merge with 3.2.Ezio Melotti2011-05-141-10/+6
|\ \ \ \ | |/ / /
| * | | Merge with 3.1.Ezio Melotti2011-05-141-10/+6
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Change import_fresh_module to work with packages.Ezio Melotti2011-05-141-10/+6
* | | (Merge 3.2) Issue #11996: libpython (gdb), replace "py-bt" command byVictor Stinner2011-05-133-2/+61
|\ \ \ | |/ /
| * | Issue #11996: libpython (gdb), replace "py-bt" command by "py-bt-full" and addVictor Stinner2011-05-133-2/+61
* | | test_logging: extended time range for rollover test.Vinay Sajip2011-05-131-1/+1
* | | test_logging: fixed bug in failure diagnostics.Vinay Sajip2011-05-131-2/+2
* | | Issue #12068: Fix appears to have worked; added more diagnostics for rare fai...Vinay Sajip2011-05-131-0/+1
* | | Further beautification of the exampleRaymond Hettinger2011-05-131-3/+6
|\ \ \ | |/ /
| * | Further beautification of the exampleRaymond Hettinger2011-05-131-3/+6
* | | Neaten up example so it can be cut and pasted.Raymond Hettinger2011-05-131-2/+2
|\ \ \ | |/ /
| * | Neaten up example so it can be cut and pasted.Raymond Hettinger2011-05-131-2/+2
* | | Added diagnostics to test_logging, after reverting last change.Vinay Sajip2011-05-131-9/+12
* | | Merge two minor doc changes into default.Georg Brandl2011-05-132-2/+3
|\ \ \ | |/ /
| * | Use singular they. Thanks to Mark Summerfield.Georg Brandl2011-05-131-1/+1
| * | Fix unbound local error in RE tokenizer example. Thanks to Herman L. Jackson.Georg Brandl2011-05-131-1/+2
* | | Merge 3.2.1 release changes into default branch (a null merge except for the ...Georg Brandl2011-05-131-0/+1
|\ \ \ | |/ /
| * | Merge in changes from 3.2.1b1 release repo.Georg Brandl2011-05-139-156/+164
| |\ \
| | * | Added tag v3.2.1b1 for changeset 8ffac2337a33Georg Brandl2011-05-081-0/+1
| | * | Update suspicious ignore file.v3.2.1b1Georg Brandl2011-05-082-94/+99
| | * | Bump to 3.2.1b1.Georg Brandl2011-05-086-63/+65