[Docutils-checkins] r5381 - in trunk/sandbox/py-rest-doc/sphinx: _jinja.py builder.py jinja.py web/util.py

[<gb...@us...>]

Author: gbrandl
Date: 2007-07-19 01:08:53 +0200 (Thu, 19 Jul 2007)
New Revision: 5381

Added:
   trunk/sandbox/py-rest-doc/sphinx/_jinja.py
Removed:
   trunk/sandbox/py-rest-doc/sphinx/jinja.py
Modified:
   trunk/sandbox/py-rest-doc/sphinx/builder.py
   trunk/sandbox/py-rest-doc/sphinx/web/util.py
Log:
Fix jinja integration.


Copied: trunk/sandbox/py-rest-doc/sphinx/_jinja.py (from rev 5373, trunk/sandbox/py-rest-doc/sphinx/jinja.py)
===================================================================
--- trunk/sandbox/py-rest-doc/sphinx/jinja.py	2007-07-16 17:37:01 UTC (rev 5373)
+++ trunk/sandbox/py-rest-doc/sphinx/_jinja.py	2007-07-18 23:08:53 UTC (rev 5381)
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+"""
+    sphinx._jinja
+    ~~~~~~~~~~~~~
+
+    Jinja glue.
+
+    :copyright: 2007 by Georg Brandl.
+    :license: Python license.
+"""
+from __future__ import absolute_import
+
+import sys
+from os import path
+
+sys.path.insert(0, path.dirname(__file__))
+
+from jinja import Environment, FileSystemLoader

Modified: trunk/sandbox/py-rest-doc/sphinx/builder.py
===================================================================
--- trunk/sandbox/py-rest-doc/sphinx/builder.py	2007-07-18 22:51:16 UTC (rev 5380)
+++ trunk/sandbox/py-rest-doc/sphinx/builder.py	2007-07-18 23:08:53 UTC (rev 5381)
@@ -263,7 +263,7 @@
     def init(self):
         """Load templates."""
         # lazily import this, maybe other builders won't need it
-        from .jinja import Environment, FileSystemLoader
+        from ._jinja import Environment, FileSystemLoader
 
         # load templates
         self.templates = {}

Deleted: trunk/sandbox/py-rest-doc/sphinx/jinja.py

Modified: trunk/sandbox/py-rest-doc/sphinx/web/util.py
===================================================================
--- trunk/sandbox/py-rest-doc/sphinx/web/util.py	2007-07-18 22:51:16 UTC (rev 5380)
+++ trunk/sandbox/py-rest-doc/sphinx/web/util.py	2007-07-18 23:08:53 UTC (rev 5381)
@@ -14,7 +14,7 @@
 from os import path
 
 from ..util import relative_uri
-from ..jinja import Environment, FileSystemLoader
+from .._jinja import Environment, FileSystemLoader
 
 
 def get_target_uri(source_filename):