From: Armin Ronacher Date: Fri, 20 Jun 2008 16:47:56 +0000 (+0200) Subject: Fixed some minor glitches. X-Git-Tag: 2.0~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63fd7983501228dda5cb1b0560c17761196b2312;p=jinja2.git Fixed some minor glitches. --HG-- branch : trunk --- diff --git a/jinja2/environment.py b/jinja2/environment.py index 57b49ae..857a1f3 100644 --- a/jinja2/environment.py +++ b/jinja2/environment.py @@ -93,7 +93,7 @@ class Environment(object): The string marking the begin of a print statement. Defaults to ``'{{'``. - `variable_stop_string` + `variable_end_string` The string marking the end of a print statement. Defaults to ``'}}'``. diff --git a/jinja2/loaders.py b/jinja2/loaders.py index 74dee5e..ccd6ec1 100644 --- a/jinja2/loaders.py +++ b/jinja2/loaders.py @@ -9,6 +9,10 @@ :license: BSD, see LICENSE for more details. """ from os import path +try: + from hashlib import sha1 +except ImportError: + from sha import new as sha1 from jinja2.exceptions import TemplateNotFound from jinja2.utils import LRUCache @@ -42,8 +46,7 @@ class BaseLoader(object): class MyLoader(BaseLoader): - def __init__(self, path, cache_size=50, auto_reload=True): - BaseLoader.__init__(self, cache_size, auto_reload) + def __init__(self, path): self.path = path def get_source(self, environment, template):