summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/__init__.py4
-rw-r--r--numpy/lib/npyio.py (renamed from numpy/lib/io.py)0
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
index 5af08b23f..1fd94a013 100644
--- a/numpy/lib/__init__.py
+++ b/numpy/lib/__init__.py
@@ -14,7 +14,7 @@ from polynomial import *
#import convertcode
from utils import *
from arraysetops import *
-from io import *
+from npyio import *
from financial import *
import math
from arrayterator import *
@@ -30,7 +30,7 @@ __all__ += ufunclike.__all__
__all__ += polynomial.__all__
__all__ += utils.__all__
__all__ += arraysetops.__all__
-__all__ += io.__all__
+__all__ += npyio.__all__
__all__ += financial.__all__
from numpy.testing import Tester
diff --git a/numpy/lib/io.py b/numpy/lib/npyio.py
index 932b13f69..932b13f69 100644
--- a/numpy/lib/io.py
+++ b/numpy/lib/npyio.py