R David Murray
4d8eee9705
Merge #17498 : Defer SMTPServerDisconnected errors until the next command.
2014-04-14 18:22:00 -04:00
R David Murray
afb151a5cc
#17498 : Defer SMTPServerDisconnected errors until the next command.
...
Normally an SMTP server will return an error, and smtplib will then issue an
RSET to return the connection to the known starting state. Some servers,
however, disconnect after issuing certain errors. When we issue the RSET,
this would result in raising an SMTPServerDisconnected error, *instead* of
returning the error code the user of the library was expecting. This fix
makes the internal RSET calls ignore the disconnection so that the error code
is returned. The user of the library will then get the SMTPServerDisconnected
error the next time they try to talk to the server.
Patch by Kushal Das.
2014-04-14 18:21:38 -04:00
Senthil Kumaran
7dc5f0af3c
merge heads
2014-04-14 16:49:07 -04:00
Senthil Kumaran
4a24d09d62
merge heads
2014-04-14 16:48:39 -04:00
Senthil Kumaran
2ff5d8103b
merge heads
2014-04-14 16:47:05 -04:00
Eric V. Smith
bcb6b058b4
Issue #13598 : Added acknowledgements to Misc/NEWS.
2014-04-14 16:46:52 -04:00
Senthil Kumaran
6b3e87d38e
merge heads
2014-04-14 16:45:49 -04:00
Senthil Kumaran
ee1fa729b9
merge heads
2014-04-14 16:44:27 -04:00
Senthil Kumaran
b735f523d3
merge heads
2014-04-14 16:43:58 -04:00
Eric V. Smith
7ce90743a1
Issue #13598 : Add auto-numbering of replacement fields to string.Formatter.
2014-04-14 16:43:50 -04:00
Senthil Kumaran
f822b73d79
merge heads
2014-04-14 16:37:57 -04:00
Senthil Kumaran
dfb2375b81
merge 3.4
...
Convert urllib.request parse_proxy doctests to unittests.
2014-04-14 16:33:21 -04:00
Gregory P. Smith
f54fbada41
merge heads
2014-04-14 13:32:35 -07:00
Senthil Kumaran
d8e24f1f71
Convert urllib.request parse_proxy doctests to unittests.
2014-04-14 16:32:20 -04:00
Gregory P. Smith
b396a2ab49
Add conditional code for android's lack of definition of SYS_getdent64.
...
Fixes issue20307. No Misc/NEWS entry because frankly this is an
esoteric platform for anyone to be figuring out how to cross compile
CPython for.
2014-04-14 13:31:55 -07:00
Gregory P. Smith
efeb9da4ae
Add conditional code for android's lack of definition of SYS_getdent64.
...
Fixes issue20307. No Misc/NEWS entry because frankly this is an
esoteric platform for anyone to be figuring out how to cross compile
CPython for.
2014-04-14 13:31:21 -07:00
Michael Foord
fddcfa27fa
Closes issue 17660. You no longer need to explicitly pass create=True when patching builtin names.
2014-04-14 16:25:20 -04:00
Michael Foord
fba913f77a
Merge
2014-04-14 16:10:02 -04:00
Michael Foord
01bafdcccc
Issue 17826. Setting an iterable side_effect on a mock created by create_autospec now works
2014-04-14 16:09:42 -04:00
Andrew Kuchling
4f7b0c3c35
#10481 : describe universal_newlines' effect on communicate()/check_output() output (alternately bytes or strings)
...
Patch by Sam Kimbrel.
2014-04-14 15:08:18 -04:00
R David Murray
94255f3a80
Merge: #15104 : improve the discussion of __main__.
2014-04-14 15:05:12 -04:00
R David Murray
061cb3b04d
#15104 : improve the discussion of __main__.
...
Patch by Sam Lucidi.
2014-04-14 15:04:47 -04:00
Senthil Kumaran
327167b348
merge 3.4
2014-04-14 14:33:14 -04:00
Senthil Kumaran
1343b25fba
Fix the NEWS Entry item. (Thanks Stéphane Wirtel)
2014-04-14 14:32:20 -04:00
Andrew Kuchling
6283691d46
#11983 : update comment to describe which fields are used and why.
...
Original patch by Caelyn McAulay; modified after discussion w/ her at
the PyCon 2014 sprints.
2014-04-14 14:19:52 -04:00
Andrew Kuchling
7f54b2bf71
Merge from 3.4
2014-04-14 13:52:34 -04:00
Andrew Kuchling
44da19a63d
#18518 : mention that including a return statement changes/breaks the behaviour
2014-04-14 13:39:43 -04:00
Benjamin Peterson
c7fee85319
merge 3.4
2014-04-14 13:13:01 -04:00
Senthil Kumaran
166214c344
merge from 3.4
...
Issue #7776 : Fix ``Host:'' header and reconnection when using http.client.HTTPConnection.set_tunnel()
Patch by Nikolaus Rath.
2014-04-14 13:10:05 -04:00
Senthil Kumaran
9da047b3a5
Issue #7776 : Fix ``Host:'' header and reconnection when using http.client.HTTPConnection.set_tunnel().
...
Patch by Nikolaus Rath.
2014-04-14 13:07:56 -04:00
Eric V. Smith
ebdaaf4087
Issue #20480 : Add ipaddress.reverse_pointer. Patch by Leon Weber.
2014-04-14 12:58:07 -04:00
Benjamin Peterson
40470e00b5
do not generate pipe names in the temporary dir
2014-04-14 12:24:37 -04:00
Benjamin Peterson
6b23088035
merge 3.4
2014-04-14 12:16:18 -04:00
Benjamin Peterson
b814057cda
merge 3.3
2014-04-14 12:16:07 -04:00
Benjamin Peterson
98816bd234
merge 3.2
2014-04-14 12:15:58 -04:00
Benjamin Peterson
49991deb6e
fix poor spelling
2014-04-14 12:15:28 -04:00
Eric V. Smith
280c458f9e
Closes issue #12546 : Allow \x00 as a fill character for builtin type __format__ methods.
2014-04-14 12:08:21 -04:00
Eric V. Smith
2ea9712ee9
Issue #12546 : Allow \x00 as a fill character for builtin type __format__ methods.
2014-04-14 11:55:10 -04:00
Benjamin Peterson
f33201b6db
merge 3.4
2014-04-14 11:48:29 -04:00
Benjamin Peterson
70d92a96ab
merge 3.3
2014-04-14 11:48:21 -04:00
Benjamin Peterson
9beee049b0
merge 3.2
2014-04-14 11:46:51 -04:00
Benjamin Peterson
6ef2b36afa
disallow a negative idx parameter
2014-04-14 11:45:21 -04:00
Michael Foord
1b16436c00
Merge
2014-04-14 11:26:38 -04:00
Michael Foord
07dc55f4c6
Merge
2014-04-14 11:25:15 -04:00
Michael Foord
a185679152
Merge
2014-04-14 11:24:38 -04:00
Michael Foord
d2623d7786
Issue 20968. unittest.mock.MagicMock now supports division
2014-04-14 11:23:48 -04:00
Mark Dickinson
393a2a0fe0
Issue #20624 : Merge exception docs tweak from 3.4 branch.
2014-04-14 11:20:45 -04:00
Mark Dickinson
abf079de25
Issue #20624 : Exception docs wording tweak - clarify that it's okay to inherit from a subclass of Exception.
2014-04-14 11:20:12 -04:00
R David Murray
ce4d9c2f51
Merge: #21169 : add comment and doc update for getpass change.
2014-04-14 10:30:43 -04:00
R David Murray
604453c9ce
#21169 : add comment and doc update for getpass change.
2014-04-14 10:28:58 -04:00