summaryrefslogtreecommitdiff
path: root/numpy/_import_tools.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2007-03-31 22:56:19 +0000
committerTravis Oliphant <oliphant@enthought.com>2007-03-31 22:56:19 +0000
commitf80ab5e1c4c5b51a7d02a22e6b8cb6f86daa3563 (patch)
tree3e03bb4ecad2400b0854a7e78017a9fc04c42702 /numpy/_import_tools.py
parentdad871430574802f8d32cd515d19df77d0a006af (diff)
downloadnumpy-f80ab5e1c4c5b51a7d02a22e6b8cb6f86daa3563.tar.gz
Add new MACRO. Fix ticket #454 by changing pkgload to a function instead of an object.
Diffstat (limited to 'numpy/_import_tools.py')
-rw-r--r--numpy/_import_tools.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/_import_tools.py b/numpy/_import_tools.py
index 48dc6372d..21c406961 100644
--- a/numpy/_import_tools.py
+++ b/numpy/_import_tools.py
@@ -7,11 +7,15 @@ from glob import glob
__all__ = ['PackageLoader']
class PackageLoader:
- def __init__(self, verbose=False):
+ def __init__(self, verbose=False, infunc=False):
""" Manages loading packages.
"""
- self.parent_frame = frame = sys._getframe(1)
+ if infunc:
+ _level = 2
+ else:
+ _level = 1
+ self.parent_frame = frame = sys._getframe(_level)
self.parent_name = eval('__name__',frame.f_globals,frame.f_locals)
parent_path = eval('__path__',frame.f_globals,frame.f_locals)
if isinstance(parent_path, str):