diff options
| author | R. Tyler Ballance <tyler@slide.com> | 2009-04-16 22:32:41 -0700 |
|---|---|---|
| committer | R. Tyler Ballance <tyler@slide.com> | 2009-04-16 22:32:41 -0700 |
| commit | 45f570f03abfbe929a14a7c23e2aa2a39ce152c5 (patch) | |
| tree | 992e83fd05db4ab0231ec1a2257ba45b744376c5 /src/ImportManager.py | |
| parent | 2fc2c598e3ab45631739fe0f582fbfc18573b417 (diff) | |
| parent | 1c42c232c419001116a099e4a49032231fff38fe (diff) | |
| download | python-cheetah-2.1.1.tar.gz | |
Merge branch 'next' of git@github.com:rtyler/cheetahv2.1.1
Diffstat (limited to 'src/ImportManager.py')
| -rwxr-xr-x | src/ImportManager.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ImportManager.py b/src/ImportManager.py index eaf398a..af9d8fc 100755 --- a/src/ImportManager.py +++ b/src/ImportManager.py @@ -407,7 +407,12 @@ class ImportManager: __builtin__.__import__ = self.importHook __builtin__.reload = self.reloadHook - def importHook(self, name, globals=None, locals=None, fromlist=None): + def importHook(self, name, globals=None, locals=None, fromlist=None, level=-1): + ''' + NOTE: Currently importHook will accept the keyword-argument "level" + but it will *NOT* use it (currently). Details about the "level" keyword + argument can be found here: http://www.python.org/doc/2.5.2/lib/built-in-funcs.html + ''' # first see if we could be importing a relative name #print "importHook(%s, %s, locals, %s)" % (name, globals['__name__'], fromlist) _sys_modules_get = sys.modules.get |