diff options
| author | Georg Brandl <georg@python.org> | 2010-01-17 17:43:33 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-01-17 17:43:33 +0100 |
| commit | b0e2c44dc86e01b31d979db3fb02098c1fb77e96 (patch) | |
| tree | deeed3a8cf5a8c36e44522669e61970cb44bcd69 /sphinx/jinja2glue.py | |
| parent | 344dab342fc1b41efb87254df7c755c70aafd095 (diff) | |
| parent | c5d67b03219f3643ea9e250a7cd3cafd5aaf2efb (diff) | |
| download | sphinx-git-b0e2c44dc86e01b31d979db3fb02098c1fb77e96.tar.gz | |
merge with trunk
Diffstat (limited to 'sphinx/jinja2glue.py')
| -rw-r--r-- | sphinx/jinja2glue.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/jinja2glue.py b/sphinx/jinja2glue.py index 9993f1749..dd963d029 100644 --- a/sphinx/jinja2glue.py +++ b/sphinx/jinja2glue.py @@ -17,7 +17,7 @@ from jinja2 import FileSystemLoader, BaseLoader, TemplateNotFound, \ from jinja2.utils import open_if_exists from jinja2.sandbox import SandboxedEnvironment -from sphinx.util import mtimes_of_files +from sphinx.util.os import mtimes_of_files from sphinx.application import TemplateBridge |