Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Removed cffi_fix, the fix is upstream #91

Merged
merged 1 commit into from

3 participants

Alex Gaynor Coveralls Donald Stufft
Alex Gaynor
Owner

No description provided.

Coveralls

Coverage Status

Coverage increased (+2.2%) when pulling c948bb2 on alex:remove-cffi-fix into ad72690 on pyca:master.

Alex Gaynor
Owner

@dstufft how would we know if this patch broke stuff? From reading the upstream CFFI issue it sounds like it might be visible by virtue of the tests failing on python3?

Donald Stufft
Owner

Yea that's correct. This shouldn't be needed anymore, so +1

Donald Stufft dstufft merged commit c591a09 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 14, 2014
  1. Alex Gaynor
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 81 deletions.
  1. +3 −2 setup.py
  2. +0 −75 src/nacl/_cffi_fix.py
  3. +0 −4 src/nacl/_lib/__init__.py
5 setup.py
View
@@ -214,10 +214,10 @@ def run(self):
author_email=nacl.__email__,
setup_requires=[
- "cffi",
+ "cffi>=0.8",
],
install_requires=[
- "cffi",
+ "cffi>=0.8",
"six",
],
extras_require={
@@ -252,5 +252,6 @@ def run(self):
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: 3.4",
]
)
75 src/nacl/_cffi_fix.py
View
@@ -1,75 +0,0 @@
-# Copyright 2013 Donald Stufft and individual contributors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import absolute_import, division, print_function
-
-import imp
-import os.path
-import sys
-
-import cffi.vengine_cpy
-import cffi.vengine_gen
-
-
-def _get_so_suffixes():
- suffixes = []
- for suffix, mode, type in imp.get_suffixes():
- if type == imp.C_EXTENSION:
- suffixes.append(suffix)
-
- if not suffixes:
- # bah, no C_EXTENSION available. Occurs on pypy without cpyext
- if sys.platform == 'win32':
- suffixes = [".pyd"]
- else:
- suffixes = [".so"]
-
- return suffixes
-
-
-def vengine_cpy_find_module(self, module_name, path, so_suffix):
- # We will ignore so_suffix and get it ourselves
- so_suffixes = _get_so_suffixes()
-
- try:
- f, filename, descr = imp.find_module(module_name, path)
- except ImportError:
- return None
- if f is not None:
- f.close()
-
- # Note that after a setuptools installation, there are both .py
- # and .so files with the same basename. The code here relies on
- # imp.find_module() locating the .so in priority.
- if descr[0] not in so_suffixes:
- return None
- return filename
-
-
-def vengine_gen_find_module(self, module_name, path, so_suffixes):
- # We will ignore so_suffix and get it ourselves
- so_suffixes = _get_so_suffixes()
-
- for so_suffix in so_suffixes:
- basename = module_name + so_suffix
- if path is None:
- path = sys.path
- for dirname in path:
- filename = os.path.join(dirname, basename)
- if os.path.isfile(filename):
- return filename
-
-
-cffi.vengine_cpy.VCPythonEngine.find_module = vengine_cpy_find_module
-cffi.vengine_gen.VGenericEngine.find_module = vengine_gen_find_module
4 src/nacl/_lib/__init__.py
View
@@ -16,10 +16,6 @@
import glob
import os.path
-# We need to import this prior to importing cffi to fix prebuilding the
-# extension modules
-from nacl import _cffi_fix # noqa
-
from cffi import FFI
from cffi.verifier import Verifier
Something went wrong with that request. Please try again.