77881 Commits

Author SHA1 Message Date
Benjamin Peterson
eddb0a7884 fix compiler warning 2013-03-20 00:40:07 -05:00
Benjamin Peterson
605a774a98 Backed out changeset 521232b05b97 2013-03-20 00:39:41 -05:00
Benjamin Peterson
c6dc12484b fix compiler warning 2013-03-19 23:20:59 -05:00
Senthil Kumaran
95dc8b5761 null merge. 2013-03-19 21:41:35 -07:00
Senthil Kumaran
620e875df2 Automated merge with file:///Users/skumaran/python/cpython 2013-03-19 21:27:23 -07:00
Senthil Kumaran
08c73e80df Automated merge with ssh://hg.python.org/cpython 2013-03-19 21:27:21 -07:00
R David Murray
9a7d3768a3 Use logic operator, not bitwise operator, for conditional. 2013-03-20 00:15:20 -04:00
R David Murray
9cc7d45571 #17485: Delete the Content-Length header if the data attribute is deleted.
This is a follow on to issue 16464.  Original patch by Daniel Wozniak.
2013-03-20 00:10:51 -04:00
Kristján Valur Jónsson
d5a6e25470 Merge with 3.3 2013-03-19 20:26:39 -07:00
Kristján Valur Jónsson
dc32d18d11 Issue #15038 : Fixing the condition broadcast and docs. 2013-03-19 20:18:37 -07:00
Kristján Valur Jónsson
32ecccaf63 Issue #15038 : Fixing the condition broadcast and docs. 2013-03-19 20:18:37 -07:00
Senthil Kumaran
6ddec17f01 #17474 - merge from 3.3. Update default Docs with versionchanged markup on what's removed 2013-03-19 18:03:39 -07:00
Kristján Valur Jónsson
d7009c6913 Issue #16475: Support object instancing, recursion and interned strings
in marshal
2013-03-19 18:02:10 -07:00
R David Murray
c7c42efb16 #15927: Fix cvs.reader parsing of escaped \r\n with quoting off.
This fix means that such values are correctly roundtripped, since
cvs.writer already does the correct escaping.

Patch by Michael Johnson.
2013-03-19 22:41:47 -04:00
Senthil Kumaran
cd3bb8b73c #17474 - Mark the deprecated Request methods as deprecated-removed. Review by Ezio Melotti 2013-03-19 18:01:43 -07:00
Michael Foord
04cbe0c35b Closes issue 17467. Add readline and readlines support to unittest.mock.mock_open 2013-03-19 17:22:51 -07:00
Senthil Kumaran
94f2788a85 #17471: merge from 3.3 2013-03-19 16:52:06 -07:00
Senthil Kumaran
f47e77f343 #17471 - merge from 3.2 2013-03-19 16:46:34 -07:00
Terry Jan Reedy
f027a204b0 Issue #13248: removed deprecated and undocumented difflib.isbjunk, isbpopular. 2013-03-19 19:44:04 -04:00
Kristján Valur Jónsson
ca038562be Merge with 3.3 2013-03-19 16:35:26 -07:00
Kristján Valur Jónsson
5cfbde0e8b Merge with 3.2 2013-03-19 16:34:39 -07:00
Kristján Valur Jónsson
5a3b288ce4 Merge with 3.3 2013-03-19 16:20:16 -07:00
Kristján Valur Jónsson
a179d283f7 Merge with 3.2 2013-03-19 16:19:24 -07:00
Senthil Kumaran
2a4d24510a #17471 - Increasing the urllib.error test coverage. Bringing it to 100%. Based on patch contributed by Daniel Wozniak 2013-03-19 16:11:07 -07:00
Kristján Valur Jónsson
d6e9f32b79 Merge 2013-03-19 16:00:01 -07:00
Kristján Valur Jónsson
ece12222ce Merge 2013-03-19 15:57:19 -07:00
Kristján Valur Jónsson
23f854ca68 Issue #10296: Merge to default 2013-03-19 15:38:32 -07:00
Kristján Valur Jónsson
a251b37179 #10296: Merge to 3.3 2013-03-19 15:35:28 -07:00
Gregory P. Smith
110f25d53d merge heads & use iso8601 date format 2013-03-19 15:33:23 -07:00
Gregory P. Smith
2f4dfd1c07 merge heads 2013-03-19 15:31:05 -07:00
Gregory P. Smith
3cc791c5a1 merge from 3.2 2013-03-19 15:30:41 -07:00
Gregory P. Smith
4effb67004 merge heads 2013-03-19 15:25:46 -07:00
Gregory P. Smith
1f1ec04c7f merge heads 2013-03-19 15:25:28 -07:00
Gregory P. Smith
c70e53aca8 Fixes Issue #17192: Update the ctypes module's libffi to v3.0.13. This
specifically addresses a stack misalignment issue on x86 and issues
on some more recent platforms.
2013-03-19 15:24:46 -07:00
Kristján Valur Jónsson
5aed330e37 Issue #10296 : Don't handle BreakPoint exceptions using
Structured Exception Handling on windows.
2013-03-19 15:24:10 -07:00
R David Murray
90cb1050d3 Merge: #1525919: Document MIMEText+set_payload encoding behavior. 2013-03-19 18:21:50 -04:00
R David Murray
432a48a0c8 Merge: #1525919: Document MIMEText+set_payload encoding behavior. 2013-03-19 18:21:22 -04:00
R David Murray
14b0124a29 #1525919: Document MIMEText+set_payload encoding behavior. 2013-03-19 18:18:55 -04:00
Gregory P. Smith
f697180431 merge heads 2013-03-19 15:07:22 -07:00
Gregory P. Smith
cca8507758 merge heads in 3.3 2013-03-19 15:05:52 -07:00
doko@ubuntu.com
04e65902e1 - update config.guess and config.sub 2013-03-19 15:03:57 -07:00
doko@ubuntu.com
41b977c453 - update config.guess and config.sub 2013-03-19 15:03:26 -07:00
Gregory P. Smith
dd35162894 merge heads in 3.2 2013-03-19 15:03:26 -07:00
Gregory P. Smith
0408bf9cfb Fixes Issue #17192: Update the ctypes module's libffi to v3.0.13. This
specifically addresses a stack misalignment issue on x86 and issues
on some more recent platforms.
2013-03-19 14:59:02 -07:00
Senthil Kumaran
0085ce8920 #17471 - merge from 3.3 2013-03-19 13:44:42 -07:00
Senthil Kumaran
d17ca23828 #17471 - merge from 3.2 2013-03-19 13:44:17 -07:00
Senthil Kumaran
843fae9312 #17471 - Improve urllib2 test coverage. Patch contributed by Daniel Wozniak 2013-03-19 13:43:42 -07:00
R David Murray
af3ba4873a Merge: #8862: Fix curses cleanup with getchar is interrupted by a signal.
I have no idea how one would write a test for this.

Patch by July Tikhonov.
2013-03-19 16:26:19 -04:00
R David Murray
779dab9447 Merge: #8862: Fix curses cleanup with getchar is interrupted by a signal.
I have no idea how one would write a test for this.

Patch by July Tikhonov.
2013-03-19 16:24:35 -04:00
R David Murray
f5d7cc239e #8862: Fix curses cleanup with getchar is interrupted by a signal.
I have no idea how one would write a test for this.

Patch by July Tikhonov.
2013-03-19 16:23:09 -04:00