Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
84,651 Commits 6 Branches 593 Tags 2.8 GiB
Commit Graph

84651 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
Kushal Das 02d23a212a Closes Issue 17861: Autogenerate Include/opcode.h from opcode.py. 
It includes required changes in Makefile.pre.in and configure.ac
among other files.
 2014-04-15 23:50:06 +05:30
Yury Selivanov cec9614475 merge 3.4 2014-04-15 12:01:57 -04: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 5f0443fb1e merge 3.4 2014-04-14 22:27:27 -04:00
Yury Selivanov e95a4b279e misc.news: Remove trailing whitespace 2014-04-14 22:25:24 -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 9417764e01 misc.news: Remove whitespace 2014-04-14 22:22:36 -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 865d23d1dd Merge: #15104: add backtick code markup. 2014-04-14 18:54:21 -04:00
R David Murray fe0e1082aa #15104: add backtick code markup. 2014-04-14 18:53:51 -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 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