Richard Oudkerk
bd153de4a4
Merge 3.4.
2014-03-23 11:57:01 +00:00
Richard Oudkerk
a40675a1a2
Issue #20990 : Fix issues found by pyflakes for multiprocessing.
2014-03-23 11:54:15 +00:00
Antoine Pitrou
39b7fce82d
Issue #21015 : SSL contexts will now automatically select an elliptic curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1".
...
(should also fix a buildbot failure introduced by #20995 )
2014-03-22 18:14:57 +01:00
Antoine Pitrou
0bebbc33fa
Issue #21015 : SSL contexts will now automatically select an elliptic curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1".
...
(should also fix a buildbot failure introduced by #20995 )
2014-03-22 18:13:50 +01:00
Benjamin Peterson
940e207412
improve the command-line interface of json.tool ( closes #21000 )
...
A patch from Berker Peksag.
2014-03-21 23:17:29 -05:00
Donald Stufft
71b4192e15
Merge changes from 3.4 to bring in fixes for Issue #20995
2014-03-21 21:38:50 -04:00
Donald Stufft
79ccaa2cad
Issue #20995 : Enhance default ciphers used by the ssl module
...
Closes #20995 by Enabling better security by prioritizing ciphers
such that:
* Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE)
* Prefer ECDHE over DHE for better performance
* Prefer any AES-GCM over any AES-CBC for better performance and security
* Then Use HIGH cipher suites as a fallback
* Then Use 3DES as fallback which is secure but slow
* Finally use RC4 as a fallback which is problematic but needed for
compatibility some times.
* Disable NULL authentication, NULL encryption, and MD5 MACs for security
reasons
2014-03-21 21:33:34 -04:00
Brett Cannon
33a4000374
Issue #20627 : xmlrpc.client.ServerProxy is now a context manager.
...
Patch by Claudiu Popa.
2014-03-21 11:24:40 -04:00
Brett Cannon
5d8a2444bf
Merge for issue #20884
2014-03-21 11:01:02 -04:00
Brett Cannon
a00c2407ca
Issue #20884 : Don't assume in importlib.__init__ that __file__ is
...
defined.
2014-03-21 10:58:33 -04:00
Brett Cannon
a77d0c36e5
Issue #19165 : The formatter module graduates to full deprecation.
2014-03-21 10:52:33 -04:00
Ethan Furman
9ab748013b
Issue19995: more informative error message; spelling corrections; use operator.mod instead of __mod__
2014-03-21 06:38:46 -07:00
Brett Cannon
46f484ee4e
merge
2014-03-21 11:02:10 -04:00
Victor Stinner
87bbefe113
asyncio: Ensure call_soon(), call_later() and call_at() are invoked on current
...
loop in debug mode. Raise a RuntimeError if the event loop of the current
thread is different. The check should help to debug thread-safetly issue.
Patch written by David Foster.
2014-03-21 10:00:52 +01:00
Benjamin Peterson
ee6bdc07d6
remove the ability of datetime.time to be considered false ( closes #13936 )
2014-03-20 18:00:35 -05:00
Giampaolo Rodola'
265ae86414
merge heads
2014-03-20 21:44:53 +01:00
Giampaolo Rodola'
f97e82937f
Fix issue 18931: selectors module now supports /dev/poll on Solaris.
2014-03-20 21:43:41 +01:00
Andrew Kuchling
a0934b2c1b
#20744 : don't try running an external 'zip' in shutil.make_archive()
...
Instead we'll just use the stdlib zipfile module. Patch by Derek Chiang
2014-03-20 16:11:16 -04:00
Zachary Ware
9636e98b18
Merge several minor doc fixes from 3.4
2014-03-20 11:28:16 -05:00
Zachary Ware
a22ae21db6
Fix parameter name in docs for os.makedirs and os.removedirs.
...
Pointed out by Colin Davis on docs@.
2014-03-20 09:42:01 -05:00
Raymond Hettinger
ad5e5ea9bb
merge
2014-03-20 06:44:33 -07:00
Raymond Hettinger
d852e997f4
Clean-up docstring
2014-03-20 06:42:31 -07:00
Vinay Sajip
ab405d5575
Closes #20444 : Merged fix from 3.4.
2014-03-20 13:15:23 +00:00
Vinay Sajip
b1698d4030
Issue #20444 : Reduced code duplication.
2014-03-20 13:14:39 +00:00
Vinay Sajip
6d5cde6a4b
Closes #20558 : Improved implementation of error handling.
2014-03-20 13:06:07 +00:00
Vinay Sajip
71dcb28d1c
Issue #20558 : Improved implementation of error handling.
2014-03-20 13:03:17 +00:00
Victor Stinner
03ce1c013d
(Merge 3.4) Issue #20976 : pyflakes: Remove unused imports
2014-03-20 09:22:39 +01:00
Victor Stinner
7fa767e517
Issue #20976 : pyflakes: Remove unused imports
2014-03-20 09:16:38 +01:00
Victor Stinner
a69f0f94d3
(Merge 3.4) Issue #20978 : pyflakes: fix undefined names; remove last part of
...
OS/2 support in distutils
2014-03-20 08:51:24 +01:00
Victor Stinner
69b1e261fc
Issue #20978 : pyflakes: fix undefined names
2014-03-20 08:50:52 +01:00
Victor Stinner
790bd6dd13
Issue #20978 : Remove last part of OS/2 support in distutils
2014-03-20 08:50:33 +01:00
Andrew Kuchling
c51da2b8a0
#14332 : provide a better explanation of junk in difflib docs
...
Initial patch by Alba Magallanes.
2014-03-19 16:43:06 -04:00
Victor Stinner
9fb288f9bd
(Merge 3.4) Skip test_urllib2.test_issue16464() is the ssl module is missing
2014-03-19 17:34:12 +01:00
Victor Stinner
9a90243f8b
Skip test_urllib2.test_issue16464() is the ssl module is missing
2014-03-19 17:31:20 +01:00
Ethan Furman
38d872ee5d
Issue19995: passing a non-int to %o, %c, %x, or %X now raises an exception
2014-03-19 08:38:52 -07:00
Kristján Valur Jónsson
8e5d0caf92
Issue #19009
...
Enhance HTTPResponse.readline() performance
2014-03-19 10:07:26 +00:00
Victor Stinner
b2bef62e91
Issue #19977 : Fix test_capi when LC_CTYPE locale is POSIX
2014-03-18 02:38:12 +01:00
Victor Stinner
97f17a784a
Issue #19977 : Enable test_c_locale_surrogateescape() on Windows
...
Only test the error handler. The encoding is not ASCII on Windows: it may the
OEM or ANSI code page.
2014-03-18 02:28:10 +01:00
Victor Stinner
07beb375b7
Issue #20574 : Remove duplicated test failing on Windows XP
2014-03-18 01:40:22 +01:00
Victor Stinner
7143029d43
Issue #19977 : When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale),
...
:py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the
``surrogateescape`` error handler, instead of the ``strict`` error handler.
2014-03-18 01:18:21 +01:00
Victor Stinner
1e48eb3b9b
Issue #20910 : Make tests more reliable, less dependent on time
...
* Tolerate 10 seconds instead of 3 seconds for slow test
* Faster test, use sleep of 100 ms instead of 1 sec
* Replace a number of iterations with an explicit deadline for the timeout
2014-03-18 00:39:04 +01:00
Victor Stinner
f8cbf78bbd
Issue #20574 : Add more tests for cp65001
2014-03-17 23:16:02 +01:00
Victor Stinner
7d00cc1a64
Issue #20574 : Implement incremental decoder for cp65001 code
...
(Windows code page 65001, Microsoft UTF-8).
2014-03-17 23:08:06 +01:00
Victor Stinner
c49926748b
(Merge 3.4) Issue #20879 : Delay the initialization of encoding and decoding
...
tables for base32, ascii85 and base85 codecs in the base64 module, and delay
the initialization of the unquote_to_bytes() table of the urllib.parse module,
to not waste memory if these modules are not used.
2014-03-17 22:39:49 +01:00
Victor Stinner
d6a91a7ab6
Issue #20879 : Delay the initialization of encoding and decoding tables for
...
base32, ascii85 and base85 codecs in the base64 module, and delay the
initialization of the unquote_to_bytes() table of the urllib.parse module, to
not waste memory if these modules are not used.
2014-03-17 22:38:41 +01:00
Benjamin Peterson
d7483993fe
merge 3.4
2014-03-17 16:20:50 -05:00
Benjamin Peterson
2a6053468e
move SharedKeyTests to test_descr
2014-03-17 16:20:12 -05:00
Benjamin Peterson
e380e0986b
merge 3.4
2014-03-17 16:00:27 -05:00
Benjamin Peterson
df813791db
correct the fix for #20637 ; allow slot descriptor inheritance to take place before creating cached keys
2014-03-17 15:57:17 -05:00
Antoine Pitrou
809383ea0d
Remove stray semicolon
2014-03-17 18:23:14 +01:00