summaryrefslogtreecommitdiff
path: root/numpy/random
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-03-01 10:43:49 -0800
committerCharles Harris <charlesr.harris@gmail.com>2013-03-01 10:43:49 -0800
commitd12dad4d42a4684d1e0a40c0105772ebab92d6bc (patch)
tree91609b16e08199176342f0a50776135e48d34334 /numpy/random
parent890ee94dd90769d303025e10d906f584088516d3 (diff)
parentcabc07e185a0ffad5f8055760b385aa5cca85896 (diff)
downloadnumpy-d12dad4d42a4684d1e0a40c0105772ebab92d6bc.tar.gz
Merge pull request #3026 from charris/2to3-fix-print
2to3: Put `from __future__ import division` in every python file.
Diffstat (limited to 'numpy/random')
-rw-r--r--numpy/random/__init__.py2
-rw-r--r--numpy/random/info.py1
-rw-r--r--numpy/random/mtrand/generate_mtrand_c.py2
-rw-r--r--numpy/random/setup.py2
-rw-r--r--numpy/random/tests/test_random.py2
-rw-r--r--numpy/random/tests/test_regression.py2
6 files changed, 11 insertions, 0 deletions
diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py
index 34e57ba2c..f005bc15a 100644
--- a/numpy/random/__init__.py
+++ b/numpy/random/__init__.py
@@ -86,6 +86,8 @@ set_state Set state of generator.
==================== =========================================================
"""
+from __future__ import division
+
# To get sub-modules
from info import __doc__, __all__
diff --git a/numpy/random/info.py b/numpy/random/info.py
index 6139e5784..c886c565e 100644
--- a/numpy/random/info.py
+++ b/numpy/random/info.py
@@ -82,6 +82,7 @@ set_state Set state of generator.
==================== =========================================================
"""
+from __future__ import division
depends = ['core']
diff --git a/numpy/random/mtrand/generate_mtrand_c.py b/numpy/random/mtrand/generate_mtrand_c.py
index a37fc7266..d6527e695 100644
--- a/numpy/random/mtrand/generate_mtrand_c.py
+++ b/numpy/random/mtrand/generate_mtrand_c.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python
+from __future__ import division
+
import sys
import re
import os
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index dde3119b7..c4582d007 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
from os.path import join, split, dirname
import os
import sys
diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py
index e8875e578..251cee30c 100644
--- a/numpy/random/tests/test_random.py
+++ b/numpy/random/tests/test_random.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
from numpy.testing import TestCase, run_module_suite, assert_,\
assert_raises
from numpy import random
diff --git a/numpy/random/tests/test_regression.py b/numpy/random/tests/test_regression.py
index 55852cc98..a19974c47 100644
--- a/numpy/random/tests/test_regression.py
+++ b/numpy/random/tests/test_regression.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
from numpy.testing import TestCase, run_module_suite, assert_,\
assert_array_equal
from numpy import random