Commit Graph

47828 Commits

Author SHA1 Message Date
Antoine Pitrou
d2dee34a85 Merge fix for issue #11450 2011-03-09 12:53:30 +01:00
Antoine Pitrou
35db8a80c1 Merge fix for issue #11450 2011-03-09 12:47:20 +01:00
Antoine Pitrou
7983d33f54 Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
2011-03-09 12:34:41 +01:00
Ned Deily
33cb5c9017 Issue #5622: merge fix from 3.2. 2011-03-09 02:49:59 -08:00
Ned Deily
2d12f96658 Issue #5622: merge fix from 3.1. 2011-03-09 02:42:23 -08:00
Ned Deily
d2853180df Issue #5622: Fix curses.wrapper to raise correct exception if curses
initialization fails.
2011-03-09 02:36:51 -08:00
Vinay Sajip
df309939e5 Issue #11444: Merge fix from 3.2. 2011-03-08 22:54:11 +00:00
Vinay Sajip
d9512e9ac1 Issue #11444: Merge fix from 3.1. 2011-03-08 22:53:21 +00:00
Vinay Sajip
c8ab6eeb01 Issue #11444: Lock handlers while flushing/closing during shutdown. 2011-03-08 22:49:57 +00:00
Giampaolo Rodolà
7a2114719d #8594: fix ResourceWarning in test_ftplib.py - patch by Nadeem Vawda. 2011-03-08 21:33:21 +01:00
Ezio Melotti
684d78cfb0 #11298: merge from 3.2. 2011-03-08 16:49:57 +02:00
Ezio Melotti
3d995843ce #11298: Improve the unittest discovery explanation. 2011-03-08 16:17:35 +02:00
Benjamin Peterson
966ed31c72 merge heads 2011-03-07 22:52:41 -06:00
Benjamin Peterson
a393bb7718 merge 3.2 2011-03-07 22:52:31 -06:00
Benjamin Peterson
3b59f332b6 merge 3.1 2011-03-07 22:51:59 -06:00
Benjamin Peterson
49d7149e6d transform izip_longest #11424 2011-03-07 22:50:37 -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
Vinay Sajip
9f9991c2f5 #Issue 11424: added equivalent fixes for dictConfig. 2011-03-07 18:02:57 +00:00
Vinay Sajip
e783553daa #Issue 11424: merged fix from 3.1. 2011-03-07 17:59:50 +00:00
Vinay Sajip
3f84b07816 Issue #11424: Fix bug in determining child loggers. 2011-03-07 17:49:33 +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