summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge 3.2Benjamin Peterson2011-03-083-16/+32
|\
| * merge 3.1Benjamin Peterson2011-03-083-16/+32
| |\
| | * transform izip_longest #11424Benjamin Peterson2011-03-083-16/+32
| | |
* | | Issue #11424: Merged fix from 3.2.Vinay Sajip2011-03-072-12/+227
|\ \ \ | |/ /
| * | #Issue 11424: added equivalent fixes for dictConfig.Vinay Sajip2011-03-072-7/+109
| | |
| * | #Issue 11424: merged fix from 3.1.Vinay Sajip2011-03-072-5/+118
| |\ \ | | |/
| | * Issue #11424: Fix bug in determining child loggers.Vinay Sajip2011-03-072-5/+118
| | |
* | | Name c -> cls in example.Georg Brandl2011-03-071-2/+2
| | |
* | | merge 3.2Benjamin Peterson2011-03-070-0/+0
|\ \ \ | |/ /
| * | merge 3.1Benjamin Peterson2011-03-071-4/+7
| |\ \ | | |/
* | | merge 3.1Benjamin Peterson2011-03-061-4/+7
|\ \ \ | | |/ | |/|
| * | only do this sys.stderr replacing on CPythonBenjamin Peterson2011-03-061-4/+7
| | |
* | | Merge 3.2.Thomas Wouters2011-03-062-2/+4
|\ \ \ | | |/ | |/|
| * | Merge 3.1.Thomas Wouters2011-03-062-2/+4
| |\ \ | | |/
| | * Issue #11411: Fix typo in the Makefile that prevented 'make DESTDIR=' fromThomas Wouters2011-03-062-2/+4
| | | | | | | | | | | | working correctly with a relative path.
* | | avoid casting with this nice macroBenjamin Peterson2011-03-061-2/+1
| | |
* | | Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that ↵Martin v. Löwis2011-03-0682-34629/+34629
|\ \ \ | |/ / | | | | | | | | | | | | the files will have the right line ending even if the extension is not active.
| * | Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that ↵Martin v. Löwis2011-03-06116-40047/+40047
| |\ \ | | |/ | | | | | | | | | | | | the files will have the right line ending even if the extension is not active.
| | * Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that ↵Martin v. Löwis2011-03-06110-38658/+38658
| | | | | | | | | | | | | | | | | | the files will have the right line ending even if the extension is not active.
* | | Merge doc fixes.Georg Brandl2011-03-068-24/+23
|\ \ \ | |/ /
| * | Merge doc fixes.Georg Brandl2011-03-068-24/+23
| |\ \ | | |/
| | * #11294: add missing ERA_T_FMT to locale docs.Georg Brandl2011-03-061-3/+8
| | |
| | * #11292: add missing A_REVERSE to curses attribute table.Georg Brandl2011-03-061-0/+3
| | |
| | * #11239: add } to list of metacharacters (it is only a metacharacter ↵Georg Brandl2011-03-061-1/+1
| | | | | | | | | | | | sometimes, ie. when closing a {n,m} group, but so is ].
| | * #11227: use Host header in asyncore example.Georg Brandl2011-03-061-1/+2
| | |
| | * #11373: fix spelling.Georg Brandl2011-03-061-1/+1
| | |
| | * #11405: do not reference the string module again for its deprecated ↵Georg Brandl2011-03-061-5/+3
| | | | | | | | | | | | functions, only for Template class.
| | * #11392: you can trust the computer, but you have to know what it does.Georg Brandl2011-03-061-3/+5
| | |
| | * #11337: remove unreferenced footnote.Georg Brandl2011-03-061-7/+0
| | |
| | * #11400: remove reference to pre-1.5 assignment behavior.Georg Brandl2011-03-061-3/+0
| | |
* | | merge headsGeorg Brandl2011-03-062-2/+5
|\ \ \
| * | | Issue #11408: In threading.Lock.acquire(), only call gettimeofday() whenAntoine Pitrou2011-03-062-2/+5
| | | | | | | | | | | | | | | | really necessary. Patch by Charles-François Natali.
* | | | Remove sys.subversion and svn build identification leftovers.Georg Brandl2011-03-068-191/+1
| | | |
* | | | Merge build identification to default branch.Georg Brandl2011-03-068-495/+659
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge build identification to 3.2 branch.Georg Brandl2011-03-068-7/+128
| |\ \ | | |/
| | * Adapt platform and test_platform to the build identification changes.Georg Brandl2011-03-052-2/+8
| | |
| | * Commit the hg build identification patch from the pymigr repo.Georg Brandl2011-03-056-5/+120
| | |
* | | Merge fix for issue #11391Antoine Pitrou2011-03-063-5/+22
|\ \ \ | |/ /
| * | Merge fix for issue #11391Antoine Pitrou2011-03-063-5/+22
| |\ \ | | |/
| | * Fix buildbot failure following 97a5590b9291Antoine Pitrou2011-03-061-3/+3
| | |
| | * Issue #11391: Writing to a mmap object created withAntoine Pitrou2011-03-064-5/+23
| | | | | | | | | | | | | | | `mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a TypeError. Patch by Charles-François Natali.
| * | Lib/email/test/data/msg_26.txt had its line endings wrong in the SVN repository.Antoine Pitrou2011-03-051-46/+46
| | | | | | | | | | | | (they were probably converted right in working copies through an SVN property)
* | | Merge tags from 3.2.Georg Brandl2011-03-051-0/+7
|\ \ \ | |/ /
| * | Merge tags from 3.1.Georg Brandl2011-03-051-0/+6
| |\ \ | | |/
| | * More tag fixups.Georg Brandl2011-03-051-6/+0
| | |
* | | Add the map of SVN revision numbers to changeset ids.Antoine Pitrou2011-03-052-0/+72547
| | | | | | | | | | | | | | | | | | | | | This is mostly to help history-digging, especially when focussing on feature branches. Note that not all changesets are in the main repository, but they are all in the full history repository.
* | | Dummy-merge 3.2 branch into default branch.Georg Brandl2011-03-050-0/+0
|\ \ \ | |/ /
| * | Dummy-merge 3.1 branch into 3.2 branch.Georg Brandl2011-03-050-0/+0
| |\ \ | | |/
| | * Add updated .hgeol file and fix newlines in the 3.1 branch.Georg Brandl2011-03-05155-55180/+55183
| | |
| | * Fix tag references in 3.1 branch.Georg Brandl2011-03-051-60/+56
| | |