Commit Graph

34590 Commits

Author SHA1 Message Date
Stefan Krah 27adf44690 Merge. 2014-04-15 22:41:36 +02:00
Stefan Krah 63c4b24900 Skip test_enums in the absence of threading. 2014-04-15 22:40:06 +02:00
Senthil Kumaran 29e2493f36 merge 3.4 2014-04-15 16:37:14 -04:00
Senthil Kumaran d943fdee87 Run test_urllib2_localnet tests using unittest.main().
Capture threads in the setUpModule and cleanup threads in the tearDownModule.
2014-04-15 16:36:43 -04:00
Kushal Das 5d1f6c3b15 Merge 2014-04-16 01:22:52 +05:30
Kushal Das 484f8a875b Closes Issue 21222.
Passing name keyword argument to mock.create_autospec now works.
2014-04-16 01:05:50 +05:30
doko@ubuntu.com a3b99a07e6 Merge 3.4 branch. 2014-04-15 20:38:28 +02:00
doko@ubuntu.com 9574355ff3 - Issue #21223: Pass test_site/test_startup_imports when some of the extensions
are built as builtins.
2014-04-15 20:37:54 +02:00
Yury Selivanov 021b27482e asyncio.tasks: Make sure CoroWrapper.send proxies one argument correctly
Issue #21209.
2014-04-15 12:01:44 -04:00
Yury Selivanov 09cc169a03 asyncio.tasks: Make sure CoroWrapper.send proxies one argument correctly
Issue #21209.
2014-04-15 12:01:16 -04:00
Vinay Sajip ddbd2ee6e5 Closes #21203: Updated fileConfig and dictConfig to remove inconsistencies. Thanks to Jure Koren for the patch. 2014-04-15 14:24:53 +01:00
Vinay Sajip 4382ad6e02 Closes #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX. 2014-04-15 13:56:36 +01:00
Vinay Sajip 809f90f369 Reverted 16efa8d27e4c after discussion with Eric. 2014-04-15 13:52:21 +01:00
Vinay Sajip 1e53f8d9bf Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX. 2014-04-15 11:18:10 +01:00
Eric V. Smith a0d107324d Closed issue #8931: Make alternate formatting for 'c' raise an exception. Patch by Torsten Landschoff. 2014-04-15 03:05:02 -04:00
Yury Selivanov 626c7b77cd syncio.tasks: Fix CoroWrapper to workaround yield-from bug in CPython < 3.4.1
Closes issue #21209.
2014-04-14 22:24:51 -04:00
Yury Selivanov f15f7484bb asyncio.tasks: Fix CoroWrapper to workaround yield-from bug in CPython < 3.4.1
Closes issue #21209.
2014-04-14 22:21:52 -04:00
Senthil Kumaran bfcc5fef9b merge 3.4 2014-04-14 21:32:13 -04:00
Senthil Kumaran cfdd0161ac Invoke test_urllibnet tests using unittest.main function 2014-04-14 21:31:41 -04:00
R David Murray 1976d9bf6d #15916: if there are no docstrings, make empty suite, not an error.
This makes doctest work like unittest: if the test case is empty, that
just means there are zero tests run, it's not an error.  The existing
behavior was broken, since it only gave an error if there were *no*
docstrings, and zero tests run if there were docstrings but none of them
contained tests.  So this makes it self-consistent as well.

Patch by Glenn Jones.
2014-04-14 20:28:36 -04:00
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 2ff5d8103b merge heads 2014-04-14 16:47:05 -04:00
Senthil Kumaran 6b3e87d38e merge heads 2014-04-14 16:45:49 -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 dfb2375b81 merge 3.4
Convert urllib.request parse_proxy doctests to unittests.
2014-04-14 16:33:21 -04:00
Senthil Kumaran d8e24f1f71 Convert urllib.request parse_proxy doctests to unittests. 2014-04-14 16:32:20 -04: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
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
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
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
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
Benjamin Peterson a548a30fed merge 3.4 (#21209) 2014-04-13 23:52:43 -04:00
Benjamin Peterson f6e50b4a81 fix sending tuples to custom generator objects with yield from (closes #21209)
Debugged by Victor.
2014-04-13 23:52:01 -04:00
Benjamin Peterson 79f3ef6336 merge 3.4 2014-04-13 22:32:12 -04:00
Benjamin Peterson 584f5cbf16 merge 3.3 2014-04-13 22:31:42 -04:00
Benjamin Peterson 156285c35f merge 3.2 2014-04-13 22:28:16 -04:00
Benjamin Peterson 99b5afab74 in scan_once, prevent the reading of arbitrary memory when passed a negative index
Bug reported by Guido Vranken.
2014-04-13 22:10:38 -04:00
R David Murray e084e97f9f Mierge #21169: fix getpass to use replace error handler on UnicodeEncodeError. 2014-04-13 22:09:29 -04:00
R David Murray d5aa487cce #21169: fix getpass to use replace error handler on UnicodeEncodeError.
If the input stream encoding couldn't encode one or more of the
non-ascii characters in the prompt, it would fail, throwing a
UnicodeEncodeError.  Now if that happens we re-encoding using the
'replace' error handler.

Patch by Kushal Das.
2014-04-13 22:07:39 -04:00