summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)Éric Araujo2012-02-0515-47/+56
|\
| * Branch mergeÉric Araujo2012-02-0515-46/+55
| |\
| | * Really make bztar support in shutil conditional.Éric Araujo2012-02-051-1/+0
| | * Improve interlinking of archiving/compression modules docs.Éric Araujo2012-01-167-16/+11
| | * Document json.dump ensure_ascii parameter (#13770)Éric Araujo2012-01-161-0/+4
| | * Stop ignoring RPMs in distutils' upload command (#2945).Éric Araujo2012-01-154-0/+24
| | * Markup improvements for the embedding CPython doc patch from #1040439Éric Araujo2012-01-151-4/+5
| | * Hide or remove user-visible XXX notes from distutils doc (#13716).Éric Araujo2012-01-151-25/+11
* | | Null merge.Nadeem Vawda2012-02-050-0/+0
|\ \ \ | |/ /
| * | Clarify note in BZ2File docs about lack of multi-stream support (issue #1625).Nadeem Vawda2012-02-051-2/+5
* | | Branch mergeÉric Araujo2012-02-057-47/+99
|\ \ \
| * | | Stop converting package_data to extra_files in pysetup create (#13712).Éric Araujo2012-02-053-28/+35
| * | | Allow multiple values for package_data in setup.cfg (#11805).Éric Araujo2012-02-043-14/+50
| * | | Improve one packaging test, remove a setuptoolism in anotherÉric Araujo2012-02-042-5/+14
* | | | merge with 3.2Georg Brandl2012-02-051-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Closes #13944: fix capitalization of class name.Georg Brandl2012-02-051-4/+4
* | | | Issue #12142: Fixed reference cycle when importing ctypesMeador Inge2012-02-051-1/+1
|\ \ \ \ | |/ / /
| * | | Issue #12142: Fixed reference cycle when importing ctypesMeador Inge2012-02-051-1/+1
* | | | _Py_Identifier are always ASCII stringsVictor Stinner2012-02-051-3/+2
* | | | Null merge.Nadeem Vawda2012-02-040-0/+0
|\ \ \ \ | |/ / /
| * | | Issue #1625: Document BZ2File's lack of support for multi-stream inputs.Nadeem Vawda2012-02-041-0/+9
* | | | Issue #13933: mergeNed Deily2012-02-042-2/+5
|\ \ \ \ | |/ / /
| * | | Issue #13933: IDLE auto-complete did not work with some importedNed Deily2012-02-042-2/+5
* | | | Fix failing test on big-endian machines (issue #13806).Antoine Pitrou2012-02-041-8/+23
|\ \ \ \ | |/ / /
| * | | Fix failing test on big-endian machines (issue #13806).Antoine Pitrou2012-02-041-8/+23
* | | | merge 3.2Benjamin Peterson2012-02-041-8/+0
|\ \ \ \ | |/ / /
| * | | threading primitives now have timeoutsBenjamin Peterson2012-02-041-8/+0
| * | | Issue #8184: Fix a potential file descriptor leak when aCharles-François Natali2012-02-041-4/+8
* | | | Issue #8184: Fix a potential file descriptor leak when aCharles-François Natali2012-02-041-4/+8
* | | | Document that some of LZMAFile.__init__()'s args are keyword-only.Nadeem Vawda2012-02-041-1/+1
* | | | Make BZ2File.__init__()'s fileobj argument keyword-only.Nadeem Vawda2012-02-042-2/+2
* | | | Update docstring for BZ2File.__init__().Nadeem Vawda2012-02-041-3/+7
| |/ / |/| |
* | | Small grammar fixes by Mark Summerfield.Georg Brandl2012-02-041-10/+10
* | | merge 3.2Benjamin Peterson2012-02-041-5/+10
|\ \ \ | |/ /
| * | put returns on their own linesBenjamin Peterson2012-02-041-5/+10
* | | merge 3.2Benjamin Peterson2012-02-041-1/+0
|\ \ \ | |/ /
| * | remove unused importBenjamin Peterson2012-02-041-1/+0
* | | Issue #13861: mergeNed Deily2012-02-031-2/+2
|\ \ \ | |/ /
| * | Issue #13861: Prevent test_apropos* test case failures in test_pydoc.Ned Deily2012-02-031-2/+2
* | | MergeBrett Cannon2012-02-038-6/+141
|\ \ \
| * | | Issue #13777: Add PF_SYSTEM sockets on OS X.Martin v. Löwis2012-02-038-6/+141
* | | | Check for errors in creating sub-interpreters when testing the C API.Brett Cannon2012-02-031-0/+8
|/ / /
* | | Issue #13901: Prevent test_packaging failures on OS X with --enable-shared.Ned Deily2012-02-031-3/+8
* | | mergeNed Deily2012-02-032-2/+10
|\ \ \ | |/ /
| * | Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.Ned Deily2012-02-032-2/+10
* | | Fix small grammatical inconsistency.Georg Brandl2012-02-021-1/+2
* | | Null merge.Charles-François Natali2012-02-020-0/+0
|\ \ \
| * \ \ Issue #13817: After fork(), reinit the ad-hoc TLS implementation earlier to fixCharles-François Natali2012-02-022-1/+26
| |\ \ \
* | \ \ \ Merge.Charles-François Natali2012-02-022-1/+26
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge.Charles-François Natali2012-02-022-1/+26
| |\ \ \ \ | | | |/ / | | |/| |