Commit graph

49387 commits

Author SHA1 Message Date
Senthil Kumaran
dcdbfec87f Recording the merge. 2011-03-12 11:44:09 +08:00
orsenthil@gmail.com
476021b3d0 Fix issue11283 - Clarifying a re pattern in the re module docs for conditional regex 2011-03-12 10:46:25 +08:00
Brett Cannon
ceae11de9b merge 2011-03-11 17:46:21 -05:00
Brett Cannon
755d5129c6 Remove a now unneeded tweak to test_zipimport_support in order to not
fail under tracing.
2011-03-11 17:44:43 -05:00
Antoine Pitrou
baf40f01e2 Merge #11403 2011-03-11 23:44:23 +01:00
Antoine Pitrou
16c4ce1903 Issue #9935: Speed up pickling of instances of user-defined classes. 2011-03-11 21:30:43 +01:00
Antoine Pitrou
f5f6288bbc Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. 2011-03-11 20:58:31 +01:00
Ezio Melotti
3b1eb1a7aa #11446: merge with 3.2. 2011-03-11 20:56:58 +02:00
Éric Araujo
a3dd56b6cf Use with statement where it improves the documentation (closes #10461) 2011-03-11 17:42:48 +01:00
Antoine Pitrou
17b880a5d6 Issue #11244: The peephole optimizer is now able to constant-fold
arbitrarily complex expressions.  This also fixes a 3.2 regression where
operations involving negative numbers were not constant-folded.
2011-03-11 17:27:02 +01:00
Eli Bendersky
336c729563 dummy merge from 3.2 2011-03-11 16:42:13 +02:00
Eli Bendersky
b191b8a717 Issue #11426: use 'with' statements on open files in CSV examples 2011-03-11 16:20:54 +02:00
Eli Bendersky
6860a92be0 Issue #11426: use 'with' statements on open files in CSV examples 2011-03-11 15:47:36 +02:00
Ezio Melotti
f0eccfd010 #11435: Merge with 3.2 2011-03-11 15:17:25 +02:00
R David Murray
5e25525da9 ? 2011-03-10 18:21:45 -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
Ezio Melotti
98d935b459 Dummy merge with 3.2. 2011-03-10 23:51:48 +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
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
Antoine Pitrou
d2dee34a85 Merge fix for issue #11450 2011-03-09 12:53:30 +01:00
Ned Deily
33cb5c9017 Issue #5622: merge fix from 3.2. 2011-03-09 02:49:59 -08:00
Vinay Sajip
df309939e5 Issue #11444: Merge fix from 3.2. 2011-03-08 22:54:11 +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
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
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