summaryrefslogtreecommitdiff
path: root/numpy/numarray/functions.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-06 07:42:08 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-04-06 07:42:08 -0700
commit49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b (patch)
treee71c0d8f6123307860a58796ed840bf32526b3fe /numpy/numarray/functions.py
parent3c8fc14665548c71a9cd144b2e16d9309a92e255 (diff)
parent4394515cd5632a7f110993ff75033d407d10861d (diff)
downloadnumpy-49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b.tar.gz
Merge pull request #3191 from charris/2to3-apply-imports-fixer
2to3: Apply `imports` fixer.
Diffstat (limited to 'numpy/numarray/functions.py')
-rw-r--r--numpy/numarray/functions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py
index 2492d5f3f..9da96009f 100644
--- a/numpy/numarray/functions.py
+++ b/numpy/numarray/functions.py
@@ -25,7 +25,6 @@ __all__ += ['vdot', 'dot', 'matrixmultiply', 'ravel', 'indices',
]
import copy
-import copy_reg
import types
import os
import sys
@@ -44,6 +43,8 @@ from .numerictypes import typefrom
if sys.version_info[0] >= 3:
import copyreg as copy_reg
+else:
+ import copy_reg
isBigEndian = sys.byteorder != 'little'
value = tcode = 'f'