aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-12 15:12:44 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-12 15:12:44 -0500
commit94efe72ab954d3894d571f745dcc86f9f917819f (patch)
treee7da4f92086773b4044b5eb9f1b604fb5806304d
parent01e3201cab97d9af98a9c7090436ec05db56d4a2 (diff)
downloadcryptography-94efe72ab954d3894d571f745dcc86f9f917819f.tar.gz
cryptography-94efe72ab954d3894d571f745dcc86f9f917819f.tar.bz2
cryptography-94efe72ab954d3894d571f745dcc86f9f917819f.zip
loop over functions and macros separately rather than using zip
-rw-r--r--cryptography/bindings/openssl/api.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/cryptography/bindings/openssl/api.py b/cryptography/bindings/openssl/api.py
index f7e14c10..ed3576aa 100644
--- a/cryptography/bindings/openssl/api.py
+++ b/cryptography/bindings/openssl/api.py
@@ -17,8 +17,6 @@ import sys
import cffi
-import six
-
from cryptography.primitives import interfaces
@@ -56,8 +54,9 @@ class API(object):
# loop over the functions & macros after declaring all the types
# so we can set interdependent types in different files and still
# have them all defined before we parse the funcs & macros
- for func, macro in six.moves.zip(functions, macros):
+ for func in functions:
self.ffi.cdef(func)
+ for macro in macros:
self.ffi.cdef(macro)
# We include functions here so that if we got any of their definitions