summaryrefslogtreecommitdiff
path: root/numpy/core/defmatrix.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-03-06 23:15:35 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-03-06 23:15:35 +0000
commit819578a1b2d5f9adf9ab6719e8b9b425c5ca7e00 (patch)
treee0dfce89c9c9fa810169d00979939a6218ceb842 /numpy/core/defmatrix.py
parent2ce56bc1c3faa7d2e9e4ba5e64e2a8bdd5bb5313 (diff)
downloadnumpy-819578a1b2d5f9adf9ab6719e8b9b425c5ca7e00.tar.gz
Apply Tim's code-checker tests except for white-space-only changes.
Diffstat (limited to 'numpy/core/defmatrix.py')
-rw-r--r--numpy/core/defmatrix.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index 1dbfb0d54..d89260ef6 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -2,8 +2,7 @@
__all__ = ['matrix', 'bmat', 'mat', 'asmatrix']
import numeric as N
-from numeric import ArrayType, concatenate, integer, multiply, power, \
- isscalar, binary_repr
+from numeric import ArrayType, concatenate, isscalar, binary_repr
import types
import string as str_
import sys
@@ -265,7 +264,7 @@ def _from_string(str,gdict,ldict):
return concatenate(rowtup,axis=0)
-def bmat(obj,ldict=None, gdict=None):
+def bmat(obj, ldict=None, gdict=None):
"""Build a matrix object from string, nested sequence, or array.
Ex: F = bmat('A, B; C, D')