Blob Blame History Raw
Index: Cheetah-2.0.1/src/ImportManager.py
===================================================================
--- Cheetah-2.0.1.orig/src/ImportManager.py
+++ Cheetah-2.0.1/src/ImportManager.py
@@ -407,7 +407,13 @@ 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=None):
+        ### FIXME: We need to do something with the level argument instead of
+        # accepting it and not changing behaviour.
+        # Level decides whether to do relative, absolute, or both styles of
+        # import.  See this for an explanation of values:
+        # 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