diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-02-27 13:26:58 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 11:22:47 -0700 |
| commit | 6aa264c4bad9c89ccdd9ecd5a1cb5ef10643ec51 (patch) | |
| tree | 15cad18dacf1ef03380c957ed9af4f39b94c5012 /numpy/matrixlib | |
| parent | 3c13c0a925276130d66be490eed4ae337712cce2 (diff) | |
| download | numpy-6aa264c4bad9c89ccdd9ecd5a1cb5ef10643ec51.tar.gz | |
2to3: Put `from __future__ import division in every python file.
This should be harmless, as we already are division clean. However,
placement of this import takes some care. In the future a script
can be used to append new features without worry, at least until
such time as it exceeds a single line. Having that ability will
make it easier to deal with absolute imports and printing updates.
Diffstat (limited to 'numpy/matrixlib')
| -rw-r--r-- | numpy/matrixlib/__init__.py | 6 | ||||
| -rw-r--r-- | numpy/matrixlib/defmatrix.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/setup.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_multiarray.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_numeric.py | 2 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_regression.py | 2 |
7 files changed, 17 insertions, 1 deletions
diff --git a/numpy/matrixlib/__init__.py b/numpy/matrixlib/__init__.py index 468a8829d..dc9a6bca9 100644 --- a/numpy/matrixlib/__init__.py +++ b/numpy/matrixlib/__init__.py @@ -1,4 +1,8 @@ -"""Sub-package containing the matrix class and related functions.""" +"""Sub-package containing the matrix class and related functions. + +""" +from __future__ import division + from defmatrix import * __all__ = defmatrix.__all__ diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index dbf2909fd..f0299ee88 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -1,3 +1,5 @@ +from __future__ import division + __all__ = ['matrix', 'bmat', 'mat', 'asmatrix'] import sys diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py index 85b090094..539e62a7f 100644 --- a/numpy/matrixlib/setup.py +++ b/numpy/matrixlib/setup.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +from __future__ import division + import os def configuration(parent_package='', top_path=None): diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index dd0b9ee08..74c379d77 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * from numpy.core import * from numpy import matrix, asmatrix, bmat diff --git a/numpy/matrixlib/tests/test_multiarray.py b/numpy/matrixlib/tests/test_multiarray.py index 9ef105aa3..6247a1c48 100644 --- a/numpy/matrixlib/tests/test_multiarray.py +++ b/numpy/matrixlib/tests/test_multiarray.py @@ -1,3 +1,5 @@ +from __future__ import division + import numpy as np from numpy.testing import * diff --git a/numpy/matrixlib/tests/test_numeric.py b/numpy/matrixlib/tests/test_numeric.py index 0b96bb05a..5539dac0d 100644 --- a/numpy/matrixlib/tests/test_numeric.py +++ b/numpy/matrixlib/tests/test_numeric.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import assert_equal, TestCase from numpy.core import ones from numpy import matrix diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py index ba0133dfd..ae352f09c 100644 --- a/numpy/matrixlib/tests/test_regression.py +++ b/numpy/matrixlib/tests/test_regression.py @@ -1,3 +1,5 @@ +from __future__ import division + from numpy.testing import * import numpy as np |