diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-08-31 11:12:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 11:12:33 -0500 |
| commit | f36d2d4d3f622f7901e3d5ade13e04fc05062948 (patch) | |
| tree | f610d44fb3d5baeabf2f3581dc502a52b46e6dd8 /numpy/tests | |
| parent | 44d3b5976d55d028e85c075933837dff150d9840 (diff) | |
| parent | 03e08148eb303c7799a18db78b8087f78e5cc2fc (diff) | |
| download | numpy-f36d2d4d3f622f7901e3d5ade13e04fc05062948.tar.gz | |
Merge pull request #10915 from mattip/implement-nep-0015
ENH: implement nep 0015: merge multiarray and umath
Diffstat (limited to 'numpy/tests')
| -rw-r--r-- | numpy/tests/test_ctypeslib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/tests/test_ctypeslib.py b/numpy/tests/test_ctypeslib.py index 62793a9d6..675f8d242 100644 --- a/numpy/tests/test_ctypeslib.py +++ b/numpy/tests/test_ctypeslib.py @@ -12,11 +12,11 @@ try: cdll = None if hasattr(sys, 'gettotalrefcount'): try: - cdll = load_library('multiarray_d', np.core.multiarray.__file__) + cdll = load_library('_multiarray_umath_d', np.core._multiarray_umath.__file__) except OSError: pass if cdll is None: - cdll = load_library('multiarray', np.core.multiarray.__file__) + cdll = load_library('_multiarray_umath', np.core._multiarray_umath.__file__) _HAS_CTYPE = True except ImportError: _HAS_CTYPE = False @@ -30,7 +30,7 @@ class TestLoadLibrary(object): def test_basic(self): try: # Should succeed - load_library('multiarray', np.core.multiarray.__file__) + load_library('_multiarray_umath', np.core._multiarray_umath.__file__) except ImportError as e: msg = ("ctypes is not available on this python: skipping the test" " (import error was: %s)" % str(e)) @@ -43,7 +43,7 @@ class TestLoadLibrary(object): try: so = get_shared_lib_extension(is_python_ext=True) # Should succeed - load_library('multiarray%s' % so, np.core.multiarray.__file__) + load_library('_multiarray_umath%s' % so, np.core._multiarray_umath.__file__) except ImportError: print("No distutils available, skipping test.") except ImportError as e: |