diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 17:15:31 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 17:15:31 +0000 |
commit | 19a94794c106aef993bb2af6a7ea11950e362d0d (patch) | |
tree | ac3e83f9359e27e07fece6e13be58560de1bc74a /numpy/__init__.py | |
parent | 775a47de7e2f4b039592d614e7ac3fda464975a8 (diff) | |
download | numpy-19a94794c106aef993bb2af6a7ea11950e362d0d.tar.gz |
Fix problem with randn in matlib. Acutally add min, max, round, abs to the numpy name-space without over-writing builtins on from numpy import *
Diffstat (limited to 'numpy/__init__.py')
-rw-r--r-- | numpy/__init__.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py index 4e8d3fcd0..a6615a41a 100644 --- a/numpy/__init__.py +++ b/numpy/__init__.py @@ -36,15 +36,17 @@ 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 import ctypeslib + # 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 + from core import round, abs, max, min + __all__ = ['__version__', 'pkgload', 'PackageLoader', 'ScipyTest', 'NumpyTest', 'show_config'] __all__ += core.__all__ |