diff options
| author | Jaime <jaime.frio@gmail.com> | 2015-01-23 12:15:09 -0800 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2015-01-23 12:15:09 -0800 |
| commit | e0807a56f6c6717b006ba80c86c3149d51990f63 (patch) | |
| tree | 55bf5bdda25cef22e4503763a22771b52a771d92 /numpy/lib/npyio.py | |
| parent | d5e02707c041e97b0b6779e6d73eeb8b236576c7 (diff) | |
| parent | 90199336e34891448ce4052f322228906a72c774 (diff) | |
| download | numpy-e0807a56f6c6717b006ba80c86c3149d51990f63.tar.gz | |
Merge pull request #5476 from juliantaylor/merge-cbase
merge _compiled_base module into multiarray
Diffstat (limited to 'numpy/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index a40de4fea..9d539d6ac 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -11,7 +11,7 @@ from operator import itemgetter import numpy as np from . import format from ._datasource import DataSource -from ._compiled_base import packbits, unpackbits +from numpy.core.multiarray import packbits, unpackbits from ._iotools import ( LineSplitter, NameValidator, StringConverter, ConverterError, ConverterLockError, ConversionWarning, _is_string_like, has_nested_fields, |