From c948bb2bb374ac2e28620a2e31af3bbf6f1b6ba5 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 14 Jul 2014 13:24:21 -0700
Subject: [PATCH] Removed cffi_fix, the fix is upstream
---
setup.py | 5 +--
src/nacl/_cffi_fix.py | 75 ---------------------------------------
src/nacl/_lib/__init__.py | 4 ---
3 files changed, 3 insertions(+), 81 deletions(-)
delete mode 100644 src/nacl/_cffi_fix.py
diff --git a/setup.py b/setup.py
index 2068a649..c9ca4362 100644
--- a/setup.py
+++ b/setup.py
@@ -214,10 +214,10 @@ setup(
author_email=nacl.__email__,
setup_requires=[
- "cffi",
+ "cffi>=0.8",
],
install_requires=[
- "cffi",
+ "cffi>=0.8",
"six",
],
extras_require={
@@ -252,5 +252,6 @@ setup(
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: 3.4",
]
)
diff --git a/src/nacl/_cffi_fix.py b/src/nacl/_cffi_fix.py
deleted file mode 100644
index 62772202..00000000
--- a/src/nacl/_cffi_fix.py
+++ /dev/null
@@ -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
diff --git a/src/nacl/_lib/__init__.py b/src/nacl/_lib/__init__.py
index d30f16c5..73590417 100644
--- a/src/nacl/_lib/__init__.py
+++ b/src/nacl/_lib/__init__.py
@@ -16,10 +16,6 @@ from __future__ import absolute_import, division, print_function
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
--
GitLab