Zachary Ware
07b4c5e1f6
Merge typo fix from 3.4
2014-04-18 09:17:04 -05:00
Benjamin Peterson
e83236f396
merge 3.4
2014-04-18 01:04:07 -04:00
Benjamin Peterson
af7c5b0bb5
merge 3.4
2014-04-17 18:29:27 -04:00
doko@ubuntu.com
f8d60ca0c4
- Merge 3.4
2014-04-17 20:14:29 +02:00
doko@ubuntu.com
dc282134ee
- Merge 3.4
2014-04-17 19:49:00 +02:00
doko@ubuntu.com
72f61de768
- fix merge conflict
2014-04-17 18:46:53 +02:00
doko@ubuntu.com
2273ab2a0d
Merge 3.4
2014-04-17 17:55:03 +02:00
Antoine Pitrou
617c4dc304
Add a --ciphers option to Lib/test/ssl_servers.py
2014-04-17 12:30:14 +02:00
Antoine Pitrou
05649f39ec
Use ssl.create_default_context in Lib/test/ssl_servers.py
2014-04-17 12:21:36 +02:00
Benjamin Peterson
8bdeb1672c
support setting fpu precision on m68k ( closes #20904 )
...
Patch from Andreas Schwab.
2014-04-17 00:00:31 -04:00
Senthil Kumaran
aedff520ea
merge 3.4
2014-04-16 23:44:03 -04:00
Senthil Kumaran
249e74aa26
merge 3.4
2014-04-16 23:33:30 -04:00
R David Murray
16b8c619cd
Merge: #18628 : clarify index entry for source file encoding declaration.
2014-04-16 21:50:25 -04:00
Thomas Wouters
67d8dc1f58
Fix Tools/scripts/generate_opcode_h.py from issue #17861 to work correctly
...
when building in a separate object tree. More people should build this way.
This may still fail if the source is unwritable, I haven't tested that yet.
2014-04-17 01:13:29 +02:00
Kushal Das
68290f4895
Removes unused varargs and varkwargs from assert_not_called().
2014-04-17 01:54:07 +05:30
Benjamin Peterson
3ae4f992d7
merge 3.4
2014-04-16 16:17:16 -04:00
Benjamin Peterson
b581ae9030
merge 3.4
2014-04-16 16:07:49 -04:00
Kushal Das
8af9db3e4f
Closes Issue 21262: New method assert_not_called for Mock.
...
It raises AssertionError if the mock has been called.
2014-04-17 01:36:14 +05:30
Kushal Das
8c14534df6
Closes Issue 21238: New keyword argument `unsafe` to Mock.
...
It raises `AttributeError` incase of an attribute startswith assert
or assret.
2014-04-16 23:32:21 +05:30
Senthil Kumaran
c3ac9af6d0
merge 3.4
2014-04-16 13:56:41 -04:00
Antoine Pitrou
94a5b663bf
Issue #20896 : ssl.get_server_certificate() now uses PROTOCOL_SSLv23, not PROTOCOL_SSLv3, for maximum compatibility.
2014-04-16 18:56:28 +02:00
Antoine Pitrou
0fba0c3ebf
Try to fix buildbot failures on old OpenSSLs (< 1.0.0) - followup to issue #21015
2014-04-16 18:34:01 +02:00
Andrew Kuchling
f5a429295d
#6490 : Expand documentation for os.popen().
...
Patch by Sam Kimbrel.
2014-04-16 09:10:53 -04:00
Terry Jan Reedy
f2dfa92704
Merge with 3.4
2014-04-15 23:44:37 -04:00
Terry Jan Reedy
62e582cdb4
Merge with 3.4
2014-04-15 23:38:44 -04:00
Eric V. Smith
a12572ff3a
Close issue #8931 : Make alternate formatting for 'c' raise an exception. Patch by Torsten Landschoff.
2014-04-15 22:37:55 -04:00
Andrew Kuchling
15b04eb429
#20103 : Rewrite description of itertools.accumulate().
...
Patch by Christian Hudon.
2014-04-15 22:28:40 -04:00
Andrew Kuchling
42a17fa4fd
Merge from 3.4
2014-04-15 21:21:56 -04:00
R David Murray
1b28088fd3
Merge #20874 fix.
2014-04-15 20:30:00 -04:00
Vinay Sajip
aef3027aaf
Closes #21245 : merged update from 3.4.
2014-04-15 23:13:54 +01:00
Michael Foord
15f2d1775e
Merge
2014-04-15 17:22:22 -04:00
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
Kushal Das
5d1f6c3b15
Merge
2014-04-16 01:22:52 +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