From: Georg Brandl <georg@python.org>
Date: Sun, 22 Nov 2009 17:35:18 +0000 (+0100)
Subject: Fix typos and one extra import.
X-Git-Tag: 2.3~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95632c4dae693127340221f7eed11f68953db4c3;p=thirdparty%2Fjinja.git

Fix typos and one extra import.

--HG--
branch : trunk
---

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 75f58d6f..a08aad20 100644
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -288,8 +288,8 @@ class Environment(object):
                 loader=missing, cache_size=missing, auto_reload=missing,
                 bytecode_cache=missing):
         """Create a new overlay environment that shares all the data with the
-        current environment except of cache and the overriden attributes.
-        Extensions cannot be removed for a overlayed environment.  A overlayed
+        current environment except of cache and the overridden attributes.
+        Extensions cannot be removed for an overlayed environment.  An overlayed
         environment automatically gets all the extensions of the environment it
         is linked to plus optional extra extensions.
 
diff --git a/jinja2/utils.py b/jinja2/utils.py
index 96167c07..be8cd6d1 100644
--- a/jinja2/utils.py
+++ b/jinja2/utils.py
@@ -268,7 +268,7 @@ def urlize(text, trim_url_limit=None, nofollow=False):
 def generate_lorem_ipsum(n=5, html=True, min=20, max=100):
     """Generate some lorem impsum for the template."""
     from jinja2.constants import LOREM_IPSUM_WORDS
-    from random import choice, random, randrange
+    from random import choice, randrange
     words = LOREM_IPSUM_WORDS.split()
     result = []