summaryrefslogtreecommitdiff
path: root/numpy/__init__.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-29 02:47:39 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-29 02:47:39 +0000
commit762dacd686faa83c7de12c115e0a5874eef0481e (patch)
treeba39d11ca3cdf5f1c62e5f6fcc61f89c85af4ee5 /numpy/__init__.py
parent8d80b96d2aa1f498b80fc19b296ff881185cd363 (diff)
downloadnumpy-762dacd686faa83c7de12c115e0a5874eef0481e.tar.gz
Add float, int, etc. to numpy name-space. Flesh out tensordot. Fix-up getcharbuf to allow all 8-bit types to be returned as a charbuf.
Diffstat (limited to 'numpy/__init__.py')
-rw-r--r--numpy/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index e864fb9b2..4e8d3fcd0 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -36,6 +36,10 @@ else:
from core import *
import lib
from lib import *
+ # Make these accessible from numpy name-space
+ # but not imported in from numpy import *
+ from __builtin__ import bool, int, long, float, complex, \
+ object, unicode, str
import linalg
import fft
import random