Commit Graph

47897 Commits

Author SHA1 Message Date
Ezio Melotti f0eccfd010 #11435: Merge with 3.2 2011-03-11 15:17:25 +02:00
Ezio Melotti 1a87e3211a #11435: Update the links generated by the source directive to use hg.python.org. 2011-03-11 15:16:01 +02:00
R David Murray 5e25525da9 ? 2011-03-10 18:21:45 -05:00
R David Murray e17e9fc37e Merge heads. 2011-03-10 18:15:25 -05:00
R David Murray 3de991f35c Merge heads 2011-03-10 18:08:10 -05:00
R David Murray ee30a0be35 Merge #10999 fix. 2011-03-10 17:38:50 -05:00
R David Murray 5647c473bc Merge #10999 fix. 2011-03-10 17:22:33 -05:00
R David Murray 30178068d9 #10999: Add missing documentation for chflags constants to stat module docs
Patch by Michal Nowikowski.
2011-03-10 17:18:33 -05:00
Ezio Melotti 98d935b459 Dummy merge with 3.2. 2011-03-10 23:51:48 +02:00
Ezio Melotti b1a7b4d691 Dummy merge with 3.1. 2011-03-10 23:49:42 +02:00
Ezio Melotti c29cd9384a Use simpler assert in basic example. 2011-03-10 23:38:18 +02:00
Gregory P. Smith 1aea1dabe5 Explicitly mention that people should not depend on immediate
finalization of  objects.
2011-03-10 11:34:52 -08:00
Gregory P. Smith f2b5673f73 Explicitly mention that people should not depend on immediate
finalization of objects.

HG Enter commit message.  Lines beginning with 'HG:' are removed.
2011-03-10 11:32:29 -08:00
Gregory P. Smith c542547211 Reword the finalization note. 2011-03-10 11:28:50 -08:00
Gregory P. Smith c60137b272 Explicitly mention that people should not depend on immediate
finalization of objects in the language reference.
2011-03-10 11:25:44 -08:00
Eric V. Smith 7eecd22411 Remove unused import. 2011-03-10 08:44:08 -05:00
Ezio Melotti a2087d0a5a Merge from 3.2. 2011-03-10 13:54:21 +02:00
Ezio Melotti 40dcb1d287 Port a couple of changes from 3.1. 2011-03-10 13:46:50 +02:00
Ezio Melotti 2d1e88a4d1 Backport from 3.2 several improvements and fixes for unittest.rst. 2011-03-10 12:16:35 +02:00
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