diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-13 14:11:04 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-13 14:11:04 -0400 |
| commit | 738707729b64ead86ebf71ba6a87a5c1d690b309 (patch) | |
| tree | 6a3d7ffd31a65900a7fda2e6791fdbefc5f47dc6 | |
| parent | 2d1d3bbc49ab3a15069591fac36f8fd59f424233 (diff) | |
| download | cryptography-738707729b64ead86ebf71ba6a87a5c1d690b309.tar.gz cryptography-738707729b64ead86ebf71ba6a87a5c1d690b309.tar.bz2 cryptography-738707729b64ead86ebf71ba6a87a5c1d690b309.zip | |
be less dumb
| -rw-r--r-- | cryptography/hazmat/bindings/utils.py | 11 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_utils.py | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/cryptography/hazmat/bindings/utils.py b/cryptography/hazmat/bindings/utils.py index 3da0412e..f79d0cb5 100644 --- a/cryptography/hazmat/bindings/utils.py +++ b/cryptography/hazmat/bindings/utils.py @@ -71,11 +71,7 @@ def build_ffi(module_prefix, modules, pre_include, post_include, libraries): ) lib = ffi.verify( source=source, - modulename=_create_modulename( - ffi, source, - sys.version, - sys.version_info - ), + modulename=_create_modulename(ffi, source, sys.version), libraries=libraries, ext_package="cryptography", ) @@ -91,7 +87,7 @@ def build_ffi(module_prefix, modules, pre_include, post_include, libraries): return ffi, lib -def _create_modulename(ffi, source, sys_version, sys_version_info): +def _create_modulename(ffi, source, sys_version): """ cffi creates a modulename internally that incorporates the cffi version. This will cause cryptography's wheels to break when the version of cffi @@ -100,8 +96,7 @@ def _create_modulename(ffi, source, sys_version, sys_version_info): from cffi but elides the version key. """ key = '\x00'.join([sys_version[:3], source] + ffi._cdefsources) - if sys_version_info >= (3,): - key = key.encode('utf-8') + key = key.encode('utf-8') k1 = hex(binascii.crc32(key[0::2]) & 0xffffffff) k1 = k1.lstrip('0x').rstrip('L') k2 = hex(binascii.crc32(key[1::2]) & 0xffffffff) diff --git a/tests/hazmat/bindings/test_utils.py b/tests/hazmat/bindings/test_utils.py index d458972e..2ba391ec 100644 --- a/tests/hazmat/bindings/test_utils.py +++ b/tests/hazmat/bindings/test_utils.py @@ -13,8 +13,6 @@ from __future__ import absolute_import, division, print_function -import sys - import pretend from cryptography.hazmat.bindings import utils @@ -23,6 +21,7 @@ from cryptography.hazmat.bindings import utils def test_create_modulename(): pretend_ffi = pretend.stub(_cdefsources=["cdef sources go here"]) source = "source code" - name = utils._create_modulename(pretend_ffi, source, sys.version, - sys.version_info) + name = utils._create_modulename(pretend_ffi, source, "2.7") assert name == "_cffi_bcba7f4bx4a14b588" + name = utils._create_modulename(pretend_ffi, source, "3.2") + assert name == "_cffi_a7462526x4a14b588" |