[Python-modules-commits] [django-jinja] 01/02: Import django-jinja_2.2.2.orig.tar.gz

[Edward Betts]

This is an automated email from the git hooks/post-receive script.

edward pushed a commit to branch master
in repository django-jinja.

commit e690fae99e55c19c230d757b896ad7cf3c7f6cf4
Author: Edward Betts <edward at 4angle.com>
Date:   Tue Jan 3 14:18:19 2017 +0000

    Import django-jinja_2.2.2.orig.tar.gz
---
 PKG-INFO                            | 2 +-
 README.rst                          | 2 --
 django_jinja.egg-info/PKG-INFO      | 2 +-
 django_jinja/builtins/extensions.py | 9 +++++++--
 django_jinja/builtins/filters.py    | 5 ++++-
 setup.py                            | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index e3b3819..328714e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: django-jinja
-Version: 2.2.1
+Version: 2.2.2
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
diff --git a/README.rst b/README.rst
index d0d46a9..40cf0e6 100644
--- a/README.rst
+++ b/README.rst
@@ -3,8 +3,6 @@ django-jinja
 
 Simple and nonobstructive jinja2 integration with Django.
 
-**Now with support for django 1.8**
-
 
 .. image:: https://img.shields.io/travis/niwinz/django-jinja.svg?style=flat
     :target: https://travis-ci.org/niwinz/django-jinja
diff --git a/django_jinja.egg-info/PKG-INFO b/django_jinja.egg-info/PKG-INFO
index e3b3819..328714e 100644
--- a/django_jinja.egg-info/PKG-INFO
+++ b/django_jinja.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: django-jinja
-Version: 2.2.1
+Version: 2.2.2
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
diff --git a/django_jinja/builtins/extensions.py b/django_jinja/builtins/extensions.py
index 4697ea2..bb8136a 100644
--- a/django_jinja/builtins/extensions.py
+++ b/django_jinja/builtins/extensions.py
@@ -7,8 +7,13 @@ import django
 from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.cache import cache
-from django.core.urlresolvers import NoReverseMatch
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import NoReverseMatch
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import NoReverseMatch
+    from django.core.urlresolvers import reverse
+
 from django.utils.formats import localize
 from django.utils.translation import pgettext
 from django.utils.translation import ugettext
diff --git a/django_jinja/builtins/filters.py b/django_jinja/builtins/filters.py
index 2f7f15a..b6637d0 100644
--- a/django_jinja/builtins/filters.py
+++ b/django_jinja/builtins/filters.py
@@ -5,7 +5,10 @@ try:
 except ImportError:
     from django.utils.encoding import force_unicode as force_text
 
-from django.core.urlresolvers import reverse as django_reverse
+try:
+    from django.urls import reverse as django_reverse
+except ImportError:
+    from django.core.urlresolvers import reverse as django_reverse
 from django.contrib.staticfiles.storage import staticfiles_storage
 from jinja2 import Markup
 
diff --git a/setup.py b/setup.py
index b545e24..bde8ce6 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ if sys.version_info < (2, 7):
 
 setup(
     name = "django-jinja",
-    version = "2.2.1",
+    version = "2.2.2",
     description = "Jinja2 templating language integrated in Django.",
     long_description = "",
     keywords = "django, jinja2",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-jinja.git