Ensure that when using the new importer, that imports from SSI code look in

grahamd · grahamd · commit 24b570488a0a · 2006-05-01T11:49:03.000Z
same directory as the file being expanded or location that request matches
as appropriate. (MODPYTHON-156)
diff --git a/lib/python/mod_python/__init__.py b/lib/python/mod_python/__init__.py
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util", "python22"]
 
-version = "3.3.0-dev-20060430"
+version = "3.3.0-dev-20060501"
 
diff --git a/lib/python/mod_python/apache.py b/lib/python/mod_python/apache.py
@@ -439,6 +439,8 @@ def IncludeDispatch(self, filter, tag, code):
 
             filter.req.ssi_globals["filter"] = filter
 
+            filter.req.ssi_globals["__file__"] = filter.req.filename
+
             code = code.rstrip()
 
             if tag == 'eval':
diff --git a/lib/python/mod_python/importer.py b/lib/python/mod_python/importer.py
@@ -1365,6 +1365,19 @@ def IncludeDispatch(self, filter, tag, code):
 
             filter.req.ssi_globals["filter"] = filter
 
+            class _InstanceInfo:
+
+                def __init__(self, label, file, cache):
+                    self.label = label
+                    self.file = file
+                    self.cache = cache
+                    self.children = {}
+                    self.path = []
+
+            filter.req.ssi_globals["__file__"] = filter.req.filename
+            filter.req.ssi_globals["__info__"] = _InstanceInfo(
+                    None, filter.req.filename, None)
+
             code = code.rstrip()
 
             if tag == 'eval':
diff --git a/src/include/mpversion.h b/src/include/mpversion.h
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 3
 #define MPV_PATCH 0
-#define MPV_BUILD 20060430
-#define MPV_STRING "3.3.0-dev-20060430"
+#define MPV_BUILD 20060501
+#define MPV_STRING "3.3.0-dev-20060501"
