Skip to content

PYTHON-398 - Only have pyximport installed while importing test modules #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpenick merged 1 commit into from
Sep 9, 2015
Merged

PYTHON-398 - Only have pyximport installed while importing test modules #395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions tests/unit/cython/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@

from cassandra.cython_deps import HAVE_CYTHON, HAVE_NUMPY

if HAVE_CYTHON:
import pyximport
pyximport.install()

try:
import unittest2 as unittest
except ImportError:
Expand All @@ -28,12 +24,12 @@ def cyimport(import_path):
Import a Cython module if available, otherwise return None
(and skip any relevant tests).
"""
try:
return __import__(import_path, fromlist=[True])
except ImportError:
if HAVE_CYTHON:
raise
return None
if HAVE_CYTHON:
import pyximport
py_importer, pyx_importer = pyximport.install()
mod = __import__(import_path, fromlist=[True])
pyximport.uninstall(py_importer, pyx_importer)
return mod


# @cythontest
Expand Down