Benjamin Peterson
a393bb7718
merge 3.2
2011-03-07 22:52:31 -06:00
Benjamin Peterson
7988ba33d9
transform izip_longest #11424
2011-03-07 22:50:37 -06:00
Vinay Sajip
4bcfb92168
Issue #11424 : Merged fix from 3.2.
2011-03-07 18:14:36 +00:00
Georg Brandl
52d3e7e6a5
Name c -> cls in example.
2011-03-07 08:31:52 +01:00
Benjamin Peterson
2b29ab1392
merge 3.2
2011-03-06 18:10:58 -06:00
Benjamin Peterson
2ae5cffb3a
merge 3.1
2011-03-06 18:04:10 -06:00
Benjamin Peterson
c9c8d0edd6
merge 3.1
2011-03-06 17:15:06 -06:00
Benjamin Peterson
d86e4c8673
only do this sys.stderr replacing on CPython
2011-03-06 17:14:30 -06:00
Thomas Wouters
63bd5f9fe3
Merge 3.2.
2011-03-06 11:52:15 -08:00
Thomas Wouters
6b1034392c
Merge 3.1.
2011-03-06 11:51:24 -08:00
Thomas Wouters
81638f1351
Issue #11411 : Fix typo in the Makefile that prevented 'make DESTDIR=' from
...
working correctly with a relative path.
2011-03-06 11:49:15 -08:00
Benjamin Peterson
5fd4bd3796
avoid casting with this nice macro
2011-03-06 09:06:34 -06:00
Martin v. Löwis
c142389218
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 12:24:49 +01:00
Martin v. Löwis
bb3e937a18
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 12:23:39 +01:00
Martin v. Löwis
21967d0b4d
Convert DOS files to CRLF. This doesn't touch the .hgeol settings, so that the files
...
will have the right line ending even if the extension is not active.
2011-03-06 11:28:23 +01:00
Georg Brandl
1ebca48030
Merge doc fixes.
2011-03-06 11:12:54 +01:00
Georg Brandl
891391bf68
Merge doc fixes.
2011-03-06 11:12:42 +01:00
Georg Brandl
1d0a0f5060
#11294 : add missing ERA_T_FMT to locale docs.
2011-03-06 11:09:51 +01:00
Georg Brandl
931e5c1038
#11292 : add missing A_REVERSE to curses attribute table.
2011-03-06 11:08:35 +01:00
Georg Brandl
a2388be2af
#11239 : add } to list of metacharacters (it is only a metacharacter sometimes, ie. when closing a {n,m} group, but so is ].
2011-03-06 11:07:11 +01:00
Georg Brandl
45ec333c72
#11227 : use Host header in asyncore example.
2011-03-06 11:05:03 +01:00
Georg Brandl
12a6153aee
#11373 : fix spelling.
2011-03-06 10:57:52 +01:00
Georg Brandl
3640e18d90
#11405 : do not reference the string module again for its deprecated functions, only for Template class.
2011-03-06 10:56:18 +01:00
Georg Brandl
da2271939a
#11392 : you can trust the computer, but you have to know what it does.
2011-03-06 10:53:55 +01:00
Georg Brandl
e32acd0d79
#11337 : remove unreferenced footnote.
2011-03-06 10:51:18 +01:00
Georg Brandl
310337f828
#11400 : remove reference to pre-1.5 assignment behavior.
2011-03-06 10:48:43 +01:00
Georg Brandl
8a1acf2e34
merge heads
2011-03-06 10:36:06 +01:00
Georg Brandl
776e586114
Remove sys.subversion and svn build identification leftovers.
2011-03-06 10:35:42 +01:00
Georg Brandl
fe09a54280
Merge build identification to default branch.
2011-03-06 10:26:32 +01:00
Georg Brandl
13039c87f1
Merge build identification to 3.2 branch.
2011-03-06 10:13:00 +01:00
Antoine Pitrou
125d5c8770
Issue #11408 : In threading.Lock.acquire(), only call gettimeofday() when
...
really necessary. Patch by Charles-François Natali.
2011-03-06 08:40:35 +01:00
Antoine Pitrou
f874debbf3
Merge fix for issue #11391
2011-03-06 01:53:19 +01:00
Antoine Pitrou
80d3610bc3
Merge fix for issue #11391
2011-03-06 01:50:56 +01:00
Antoine Pitrou
7b50c2c6ae
Fix buildbot failure following 97a5590b9291
2011-03-06 01:47:18 +01:00
Antoine Pitrou
16a0a0b0a0
Issue #11391 : Writing to a mmap object created with
...
`mmap.PROT_READ|mmap.PROT_EXEC` would segfault instead of raising a
TypeError. Patch by Charles-François Natali.
2011-03-06 01:11:03 +01:00
Antoine Pitrou
d1b1991fd4
Lib/email/test/data/msg_26.txt had its line endings wrong in the SVN repository.
...
(they were probably converted right in working copies through an SVN property)
2011-03-05 21:49:50 +01:00
Georg Brandl
8256242b30
Adapt platform and test_platform to the build identification changes.
2011-03-05 21:09:22 +01:00
Georg Brandl
1ca2e7965c
Commit the hg build identification patch from the pymigr repo.
2011-03-05 20:51:24 +01:00
Georg Brandl
53b13e9873
Merge tags from 3.2.
2011-03-05 20:31:42 +01:00
Georg Brandl
776e2d4d22
Merge tags from 3.1.
2011-03-05 20:30:52 +01:00
Georg Brandl
3c2ccf2936
More tag fixups.
2011-03-05 20:29:01 +01:00
Antoine Pitrou
533c79dc67
Add the map of SVN revision numbers to changeset ids.
...
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.
2011-03-05 17:46:03 +01:00
Georg Brandl
4f10b7674d
Dummy-merge 3.2 branch into default branch.
2011-03-05 15:16:28 +01:00
Georg Brandl
766f1645ee
Dummy-merge 3.1 branch into 3.2 branch.
2011-03-05 15:15:55 +01:00
Georg Brandl
45b0b0195b
Fix tag references in default branch.
2011-03-05 15:12:14 +01:00
Georg Brandl
49857f8a93
Add updated .hgeol file and fix newlines in the 3.2 branch.
2011-03-05 15:11:35 +01:00
Georg Brandl
b2a39da238
Fix tag references in 3.2 branch.
2011-03-05 15:11:23 +01:00
Georg Brandl
5537d298ea
Add updated .hgeol file and fix newlines in the 3.1 branch.
2011-03-05 15:10:38 +01:00
Georg Brandl
6e63a41801
Fix tag references in 3.1 branch.
2011-03-05 15:10:23 +01:00
Victor Stinner
27ee089c35
Issue #3080 : Add PyImport_AddModuleObject() and PyImport_ExecCodeModuleObject()
2011-03-04 12:57:09 +00:00