fixed an embarrassing mistake in the documentation

--HG--
branch : trunk

diff --git a/docs/intro.rst b/docs/intro.rst
index e1d07eb7dd9b186a1e1c1e046caeb5eed5cf4aef..ffb683906d8889138deb068d18a42f1ba9af6e9e 100644 (file)
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -72,7 +72,7 @@ Installing the development version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1.  Install `mercurial`_
-2.  ``svn co http://dev.pocoo.org/hg/jinja2-main jinja2``
+2.  ``hg clone http://dev.pocoo.org/hg/jinja2-main jinja2``
 3.  ``cd jinja2``
 4.  ``ln -s jinja2 /usr/lib/python2.X/site-packages``
 

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 37ebdc6aa14015db6664d1292c281734fd4bb5e2..f8826e64dd0a6a86dba4716634b0792f70ac1a4c 100644 (file)
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -604,7 +604,7 @@ class TemplateModule(object):
         self.__name__ = template.name
 
     __html__ = lambda x: Markup(concat(x._body_stream))
-    __unicode__ = lambda x: unicode(concat(x._body_stream))
+    __unicode__ = lambda x: concat(x._body_stream)
 
     def __str__(self):
         return unicode(self).encode('utf-8')

diff --git a/jinja2/runtime.py b/jinja2/runtime.py
index 085120bd30bf52685b2f3954ed950091c4ea9d1e..76eae80267598aaae37d35f840a7eb490a12db81 100644 (file)
--- a/jinja2/runtime.py
+++ b/jinja2/runtime.py
@@ -140,10 +140,13 @@ class Context(object):
         return name in self.vars or name in self.parent
 
     def __getitem__(self, key):
-        """Lookup a variable or raise `KeyError`."""
-        if key in self.vars:
-            return self.vars[key]
-        return self.parent[key]
+        """Lookup a variable or raise `KeyError` if the variable is
+        undefined.
+        """
+        item = self.resolve(key)
+        if isinstance(item, Undefined):
+            raise KeyError(key)
+        return item
 
     def __repr__(self):
         return '<%s %s of %r>' % (