diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-19 13:47:33 +0100 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-19 13:47:33 +0100 |
| commit | 4a41dd67537a0d1f10bc1e0d074924161cfa4317 (patch) | |
| tree | 3b20169a73b894e0356e4eb13bba3ae57b11d1bd /jinja2 | |
| parent | c87d4cf11fe91dc4f477e0f815d0d0dfd6434d12 (diff) | |
| download | jinja2-4a41dd67537a0d1f10bc1e0d074924161cfa4317.tar.gz | |
Fixed a docstring and a syntax error on 3.3
Diffstat (limited to 'jinja2')
| -rw-r--r-- | jinja2/_compat.py | 6 | ||||
| -rw-r--r-- | jinja2/testsuite/inheritance.py | 2 |
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) |