summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis E. Oliphant <teoliphant@gmail.com>2012-05-28 09:39:19 -0700
committerTravis E. Oliphant <teoliphant@gmail.com>2012-05-28 09:39:19 -0700
commitfce322d5605793f6a5baecfd7f620c79936b768c (patch)
treed6e01c35a5ff4f6bfc6054be980ccaff0520e66d
parent3f45eaa310b0ead7270d56697018173dc4b7daad (diff)
parentb7e76c15da2d20d194dc56355e0dbabfdaa45636 (diff)
downloadnumpy-fce322d5605793f6a5baecfd7f620c79936b768c.tar.gz
Merge pull request #286 from yarikoptic/master
Explicit import of modules into the space in core/__init__.py
-rw-r--r--numpy/core/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 273160b95..5d1599111 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -7,7 +7,9 @@ import umath
import _internal # for freeze programs
import numerictypes as nt
multiarray.set_typeDict(nt.sctypeDict)
+import numeric
from numeric import *
+import fromnumeric
from fromnumeric import *
import defchararray as char
import records as rec
@@ -15,9 +17,13 @@ from records import *
from memmap import *
from defchararray import chararray
import scalarmath
+import function_base
from function_base import *
+import machar
from machar import *
+import getlimits
from getlimits import *
+import shape_base
from shape_base import *
del nt