Merge pull request apache#395 from datastax/398

mpenick · mpenick · commit 4b923bbb651b · 2015-09-09T10:09:49.000-07:00
PYTHON-398 - Only have pyximport installed while importing test modules
diff --git a/tests/unit/cython/utils.py b/tests/unit/cython/utils.py
@@ -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:
@@ -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
