summaryrefslogtreecommitdiff
path: root/jinja2
diff options
context:
space:
mode:
Diffstat (limited to 'jinja2')
-rw-r--r--jinja2/_compat.py6
-rw-r--r--jinja2/testsuite/inheritance.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/jinja2/_compat.py b/jinja2/_compat.py
index 7825cb6..8c1963c 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 a5b9465..e0f51cd 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)