[Python-modules-commits] [django-jinja] 01/03: Import django-jinja_2.2.1.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 6688c62416b71c64ba287d831ef6a91985f92604
Author: Edward Betts <edward at 4angle.com>
Date:   Wed Aug 31 11:52:40 2016 +0100

    Import django-jinja_2.2.1.orig.tar.gz
---
 PKG-INFO                            | 2 +-
 django_jinja.egg-info/PKG-INFO      | 2 +-
 django_jinja/backend.py             | 7 ++++---
 django_jinja/builtins/extensions.py | 2 +-
 django_jinja/builtins/filters.py    | 2 +-
 setup.cfg                           | 2 +-
 setup.py                            | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 0d668aa..e3b3819 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: django-jinja
-Version: 2.1.3
+Version: 2.2.1
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
diff --git a/django_jinja.egg-info/PKG-INFO b/django_jinja.egg-info/PKG-INFO
index 0d668aa..e3b3819 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.1.3
+Version: 2.2.1
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
diff --git a/django_jinja/backend.py b/django_jinja/backend.py
index 599df7f..08dc62e 100644
--- a/django_jinja/backend.py
+++ b/django_jinja/backend.py
@@ -20,7 +20,7 @@ from django.conf import settings
 from django.core import signals
 from django.core.exceptions import ImproperlyConfigured
 from django.dispatch import receiver
-from django.middleware.csrf import get_token
+from django.middleware import csrf
 from django.template import RequestContext
 from django.template import TemplateDoesNotExist
 from django.template import TemplateSyntaxError
@@ -34,6 +34,7 @@ from django.utils.encoding import smart_text
 from django.utils.functional import SimpleLazyObject
 from django.utils.functional import cached_property
 from django.utils.module_loading import import_string
+from django.utils.safestring import mark_safe
 
 from . import base
 from . import builtins
@@ -69,7 +70,7 @@ class Template(object):
 
         if request is not None:
             def _get_val():
-                token = get_token(request)
+                token = csrf.get_token(request)
                 if token is None:
                     return 'NOTPROVIDED'
                 else:
@@ -102,7 +103,7 @@ class Template(object):
                                            context=context)
 
 
-        return self.template.render(context)
+        return mark_safe(self.template.render(context))
 
 
 class Jinja2(BaseEngine):
diff --git a/django_jinja/builtins/extensions.py b/django_jinja/builtins/extensions.py
index a462e9d..4697ea2 100644
--- a/django_jinja/builtins/extensions.py
+++ b/django_jinja/builtins/extensions.py
@@ -188,6 +188,7 @@ class DjangoFiltersExtension(Extension):
         environment.filters["slugify"] = filters.slugify
         environment.filters["stringformat"] = filters.stringformat
         environment.filters["truncatechars"] = filters.truncatechars
+        environment.filters["truncatechars_html"] = filters.truncatechars_html
         environment.filters["truncatewords"] = filters.truncatewords
         environment.filters["truncatewords_html"] = filters.truncatewords_html
         environment.filters["urlizetrunc"] = filters.urlizetrunc
@@ -196,7 +197,6 @@ class DjangoFiltersExtension(Extension):
         environment.filters["cut"] = filters.cut
         environment.filters["linebreaksbr"] = filters.linebreaksbr
         environment.filters["linebreaks"] = filters.linebreaks_filter
-        environment.filters["removetags"] = filters.removetags
         environment.filters["striptags"] = filters.striptags
         environment.filters["add"] = filters.add
         environment.filters["date"] = filters.date
diff --git a/django_jinja/builtins/filters.py b/django_jinja/builtins/filters.py
index 246a8c6..2f7f15a 100644
--- a/django_jinja/builtins/filters.py
+++ b/django_jinja/builtins/filters.py
@@ -39,6 +39,7 @@ from django.template.defaultfilters import make_list
 from django.template.defaultfilters import stringformat
 from django.template.defaultfilters import title
 from django.template.defaultfilters import truncatechars
+from django.template.defaultfilters import truncatechars_html
 from django.template.defaultfilters import truncatewords
 from django.template.defaultfilters import truncatewords_html
 from django.template.defaultfilters import upper
@@ -54,7 +55,6 @@ from django.template.defaultfilters import center
 from django.template.defaultfilters import cut
 from django.template.defaultfilters import linebreaks_filter
 from django.template.defaultfilters import linebreaksbr
-from django.template.defaultfilters import removetags
 from django.template.defaultfilters import striptags
 from django.template.defaultfilters import join
 from django.template.defaultfilters import length
diff --git a/setup.cfg b/setup.cfg
index 00bb0ae..861a9f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [egg_info]
+tag_build = 
 tag_date = 0
 tag_svn_revision = 0
-tag_build = 
 
diff --git a/setup.py b/setup.py
index bcf0d1e..b545e24 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ if sys.version_info < (2, 7):
 
 setup(
     name = "django-jinja",
-    version = "2.1.3",
+    version = "2.2.1",
     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