r47355 - Merge attribute-spaces-8315: Fix attribute names for SSL constants.
mithrandi-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Fri, 6 May 2016 21:04:24 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: mithrandi
Date: Fri May 6 21:04:16 2016
New Revision: 47355
Added:
trunk/twisted/topfiles/8315.misc
Modified:
trunk/twisted/internet/_sslverify.py
Log:
Merge attribute-spaces-8315: Fix attribute names for SSL constants.
Author: mithrandi
Reviewer: adiroiban
Fixes: #8315
Some of the constant names had spaces, so the fallback was always used.
Modified: trunk/twisted/internet/_sslverify.py
==============================================================================
--- trunk/twisted/internet/_sslverify.py (original)
+++ trunk/twisted/internet/_sslverify.py Fri May 6 21:04:16 2016
@@ -1364,9 +1364,9 @@
_OP_ALL = getattr(SSL, 'OP_ALL', 0x0000FFFF)
_OP_NO_TICKET = getattr(SSL, 'OP_NO_TICKET', 0x00004000)
_OP_NO_COMPRESSION = getattr(SSL, 'OP_NO_COMPRESSION', 0x00020000)
- _OP_CIPHER_SERVER_PREFERENCE = getattr(SSL, 'OP_CIPHER_SERVER_PREFERENCE ',
+ _OP_CIPHER_SERVER_PREFERENCE = getattr(SSL, 'OP_CIPHER_SERVER_PREFERENCE',
0x00400000)
- _OP_SINGLE_ECDH_USE = getattr(SSL, 'OP_SINGLE_ECDH_USE ', 0x00080000)
+ _OP_SINGLE_ECDH_USE = getattr(SSL, 'OP_SINGLE_ECDH_USE', 0x00080000)
@_mutuallyExclusiveArguments([