more janitorial work

1 files changed, 7 insertions, 8 deletions

diff --git a/numpy/matlib.py b/numpy/matlib.py
index cfc61f4f6..568169888 100644
--- a/numpy/matlib.py
+++ b/numpy/matlib.py
@@ -1,11 +1,10 @@
-from numpy.core.defmatrix import matrix, asmatrix
+import numpy as np
 from numpy import ndarray, array
-import numpy as N
-from numpy import *
+from numpy.core.defmatrix import matrix, asmatrix
 
-__version__ = N.__version__
+__version__ = np.__version__
 
-__all__ = N.__all__[:] # copy numpy namespace
+__all__ = np.__all__[:] # copy numpy namespace
 __all__ += ['rand', 'randn', 'repmat']
 
 def empty(shape, dtype=None, order='C'):
@@ -36,17 +35,17 @@ def identity(n,dtype=None):
     return b
 
 def eye(n,M=None, k=0, dtype=float):
-    return asmatrix(N.eye(n,M,k,dtype))
+    return asmatrix(np.eye(n,M,k,dtype))
 
 def rand(*args):
     if isinstance(args[0], tuple):
         args = args[0]
-    return asmatrix(N.random.rand(*args))
+    return asmatrix(np.random.rand(*args))
 
 def randn(*args):
     if isinstance(args[0], tuple):
         args = args[0]
-    return asmatrix(N.random.randn(*args))
+    return asmatrix(np.random.randn(*args))
 
 def repmat(a, m, n):
     """Repeat a 0-d to 2-d array mxn times