Fixed some minor glitches.

--HG--
branch : trunk

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 57b49ae11703bd75d44324706ddcdbe8185591ba..857a1f393ca1948068d88770f7e09c7f220166ba 100644 (file)
--- 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 74dee5e05f146536660ded7ee8e0c6b18c0b1892..ccd6ec183a2af664c4fc8a1e2fae7915892a7d9b 100644 (file)
--- 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):