Commit Graph

77903 Commits

Author SHA1 Message Date
Gregory P. Smith 16ea14a690 Refactor the Windows specific and POSIX specific implementations of
listdir into two separate coherent functions rather than interleaved
#ifdef's.
2013-03-20 18:51:33 -07:00
Gregory P. Smith e25df59427 merge 2013-03-20 18:32:45 -07:00
Gregory P. Smith 74b24047e3 merge 2013-03-20 18:32:22 -07:00
Gregory P. Smith 1f8a40b81d remove the long obsolete mention of universal newlines mode only being
available when configured at compile time.
2013-03-20 18:32:03 -07:00
R David Murray 82c6b45c14 Merge: #5713: Handle 421 error codes during sendmail by closing the socket.
This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
2013-03-20 21:13:56 -04:00
R David Murray f1a40b4ec5 Merge: #5713: Handle 421 error codes during sendmail by closing the socket.
This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
2013-03-20 21:12:17 -04:00
R David Murray d312c740f1 #5713: Handle 421 error codes during sendmail by closing the socket.
This is a partial fix to the issue of servers disconnecting unexpectedly; in
this case the 421 says they are disconnecting, so we close the socket and
return the 421 in the appropriate error context.

Original patch by Mark Sapiro, updated by Kushal Das, with additional
tests by me.
2013-03-20 20:36:14 -04:00
Kristján Valur Jónsson 6168362509 Issue #16475 : Correctly handle the EOF when reading marshal streams. 2013-03-20 14:26:33 -07:00
doko@ubuntu.com f219c8da49 - .hgtouch: Add dependencies for GRAMMAR_H and GRAMMAR_C 2013-03-20 12:38:50 -07:00
Kristján Valur Jónsson e178187bf6 Issue #16475: Simplify the interface to r_ref_allocate and improve comments. 2013-03-20 11:43:57 -07:00
doko@ubuntu.com 8d0e427c39 - Merge 3.3 (.hgtouch) 2013-03-20 12:39:38 -07:00
Antoine Pitrou c9b3ef2df0 Issue #16997: unittest.TestCase now provides a subTest() context manager to procedurally generate, in an easy way, small test instances. 2013-03-20 20:16:47 +01:00
Ezio Melotti a612176c9c #17493: merge with 3.3. 2013-03-20 18:16:05 +02:00
Ezio Melotti a49178e48e #17493: merge with 3.2. 2013-03-20 18:15:37 +02:00
Ezio Melotti 958f7ae865 #17493: re-enable a test on Windows. Patch by Zachary Ware. 2013-03-20 18:14:48 +02:00
Ezio Melotti c622bf3f85 Merge usage of argument/parameter and markup fixes from 3.3. 2013-03-20 13:54:30 +02:00
Ezio Melotti ba7dd670cb Merge usage of argument/parameter and markup fixes from 3.2. 2013-03-20 13:54:18 +02:00
Ezio Melotti 93115e0914 Fix usage of argument/parameter and markup. 2013-03-20 13:53:32 +02:00
Gregory P. Smith 6409989dc8 clarifiy the documentation for issue17285. see also commit
ee30400efceb which updated the docstring.
2013-03-19 23:36:59 -07:00
Gregory P. Smith f16455aa4a clarifiy the documentation for issue17285. see also commit
ee30400efceb which updated the docstring.
2013-03-19 23:36:31 -07:00
Gregory P. Smith 016b9e38f7 Use a larger amount of data for tests such as the interrupted_write
tests that depend on filling up an OS pipe so that they work properly
on systems configured with large pipe buffers.

Also a subprocess docstring update that i forgot was in my client when
i did the original 3.3 commit... easier to just leave that in here
with this one than go back and undo/redo.
2013-03-19 23:27:09 -07:00
Gregory P. Smith 91110f5e55 Use a larger amount of data for tests such as the interrupted_write
tests that depend on filling up an OS pipe so that they work properly
on systems configured with large pipe buffers.
2013-03-19 23:25:16 -07:00
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
Senthil Kumaran 620e875df2 Automated merge with file:///Users/skumaran/python/cpython 2013-03-19 21:27:23 -07: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 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