diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2017-04-30 10:59:58 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-04-30 09:59:58 -0500 |
| commit | cb94281f5b788f583f5f8a5b689dc9dce321ff8e (patch) | |
| tree | 40cdbd89a51edf6a11795ddee56674d8f0f77f57 /src | |
| parent | 0417d00d9ff1e19bc3ab67d39bdd18e1674768c1 (diff) | |
| download | cryptography-cb94281f5b788f583f5f8a5b689dc9dce321ff8e.tar.gz cryptography-cb94281f5b788f583f5f8a5b689dc9dce321ff8e.tar.bz2 cryptography-cb94281f5b788f583f5f8a5b689dc9dce321ff8e.zip | |
Delete dead code and update a comment (#3529)
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/osrandom_engine.py | 2 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/osrandom_engine.py b/src/_cffi_src/openssl/osrandom_engine.py index 10c5a608..93af8cf7 100644 --- a/src/_cffi_src/openssl/osrandom_engine.py +++ b/src/_cffi_src/openssl/osrandom_engine.py @@ -25,5 +25,3 @@ MACROS = """ with open(os.path.join(HERE, "src/osrandom_engine.c")) as f: CUSTOMIZATIONS = f.read() - -CONDITIONAL_NAMES = {} diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 8605477d..11e329e7 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -4,9 +4,9 @@ from __future__ import absolute_import, division, print_function -# This is a temporary copy of all the CONDITIONAL_NAMES from _cffi_src so -# we can loop over them and delete them at runtime. It will be removed when -# cffi supports #if in cdef +# This is a mapping of {condition: names-dependent-on-that-condition} so we can +# loop over them and delete unsupported names at runtime. It will be removed +# when cffi supports #if in cdef. CONDITIONAL_NAMES = { "Cryptography_HAS_CMS": [ |