From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 19 May 2013 12:47:33 +0000 (+0100)
Subject: Fixed a docstring and a syntax error on 3.3
X-Git-Tag: 2.7~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a41dd67537a0d1f10bc1e0d074924161cfa4317;p=thirdparty%2Fjinja.git

Fixed a docstring and a syntax error on 3.3
---

diff --git a/jinja2/_compat.py b/jinja2/_compat.py
index 7825cb6a..8c1963c4 100644
--- a/jinja2/_compat.py
+++ b/jinja2/_compat.py
@@ -4,9 +4,9 @@
     ~~~~~~~~~~~~~~
 
     Some py2/py3 compatibility support that is not yet available in
-     "six" 1.3.0.
-    There are bugs open for "six" for all this stuff, so we can remove it
-    again from here as soon as we require a new enough "six" release.
+    "six" 1.3.0.  Generally all uses of six should go through this module
+    so that we have one central place to remove stuff from when we
+    eventually drop 2.x.
 
     :copyright: Copyright 2013 by the Jinja team, see AUTHORS.
     :license: BSD, see LICENSE for details.
diff --git a/jinja2/testsuite/inheritance.py b/jinja2/testsuite/inheritance.py
index a5b94658..e0f51cda 100644
--- a/jinja2/testsuite/inheritance.py
+++ b/jinja2/testsuite/inheritance.py
@@ -239,7 +239,7 @@ class BugFixTestCase(JinjaTestCase):
         """
         try:
             tmpl = env.get_template('doublee')
-        except Exception, e:
+        except Exception as e:
             assert isinstance(e, TemplateError)