diff options
| author | njsmith <njs@pobox.com> | 2013-04-02 08:53:45 -0700 |
|---|---|---|
| committer | njsmith <njs@pobox.com> | 2013-04-02 08:53:45 -0700 |
| commit | a939f2aa83e7d37d5e35e7c2a8c539c59f682598 (patch) | |
| tree | a5d3044d62baa8f52b2d7f42cfde58efd364eaf1 /numpy/numarray/functions.py | |
| parent | 5b74363e020f90f09dd41916dfc749d56421b3fa (diff) | |
| parent | 670b12649e34164514fc4981d8fbacfadf1f389e (diff) | |
| download | numpy-a939f2aa83e7d37d5e35e7c2a8c539c59f682598.tar.gz | |
Merge pull request #3178 from charris/2to3-apply-import-fixer
2to3 apply import fixer
Diffstat (limited to 'numpy/numarray/functions.py')
| -rw-r--r-- | numpy/numarray/functions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 2e12a4149..2492d5f3f 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -1,4 +1,4 @@ -from __future__ import division +from __future__ import division, absolute_import # missing Numarray defined names (in from numarray import *) @@ -40,7 +40,7 @@ from numpy import dot as matrixmultiply, dot, vdot, ravel, concatenate, all,\ resize, searchsorted, shape, size, sort, swapaxes, trace, transpose import numpy as np -from numerictypes import typefrom +from .numerictypes import typefrom if sys.version_info[0] >= 3: import copyreg as copy_reg |