summaryrefslogtreecommitdiff
path: root/numpy/lib/twodim_base.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-07-31 14:30:10 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-07-31 14:30:10 -0600
commitae7c942ced535fb39384aefeb8d32df92fb15988 (patch)
treed06ae19daed6c32522e3a06fb27afb4490302d0d /numpy/lib/twodim_base.py
parent2ad538899928c249af456d93f250ebbd7535dcff (diff)
parent01b0d7e82211b581aaff925e3ccc36cff9ac1895 (diff)
downloadnumpy-ae7c942ced535fb39384aefeb8d32df92fb15988.tar.gz
Merge pull request #4929 from juliantaylor/charris-pep8-numpy-lib
Charris pep8 numpy lib
Diffstat (limited to 'numpy/lib/twodim_base.py')
-rw-r--r--numpy/lib/twodim_base.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
index 7670da1ed..40a140b6b 100644
--- a/numpy/lib/twodim_base.py
+++ b/numpy/lib/twodim_base.py
@@ -3,19 +3,19 @@
"""
from __future__ import division, absolute_import, print_function
-__all__ = ['diag', 'diagflat', 'eye', 'fliplr', 'flipud', 'rot90', 'tri',
- 'triu', 'tril', 'vander', 'histogram2d', 'mask_indices',
- 'tril_indices', 'tril_indices_from', 'triu_indices',
- 'triu_indices_from',
- ]
-
from numpy.core.numeric import (
- asanyarray, subtract, arange, zeros, greater_equal, multiply, ones,
- asarray, where, less, int8, int16, int32, int64, empty, promote_types
+ asanyarray, arange, zeros, greater_equal, multiply, ones, asarray,
+ where, int8, int16, int32, int64, empty, promote_types
)
from numpy.core import iinfo
+__all__ = [
+ 'diag', 'diagflat', 'eye', 'fliplr', 'flipud', 'rot90', 'tri', 'triu',
+ 'tril', 'vander', 'histogram2d', 'mask_indices', 'tril_indices',
+ 'tril_indices_from', 'triu_indices', 'triu_indices_from', ]
+
+
i1 = iinfo(int8)
i2 = iinfo(int16)
i4 = iinfo(int32)