[Python-modules-commits] [django-jinja] 01/03: Import django-jinja_2.3.0.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 3d349ab45f0a40d8ea782d35937ab3c63d3112cd
Author: Edward Betts <edward at 4angle.com>
Date:   Sun Apr 30 21:22:47 2017 +0100

    Import django-jinja_2.3.0.orig.tar.gz
---
 PKG-INFO                                         |  4 +++-
 README.rst                                       |  3 ---
 django_jinja.egg-info/PKG-INFO                   |  4 +++-
 django_jinja/management/commands/makemessages.py | 14 ++++++++++----
 setup.cfg                                        |  1 -
 setup.py                                         |  4 +++-
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 328714e..937a284 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: django-jinja
-Version: 2.2.2
+Version: 2.3.0
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
@@ -20,4 +20,6 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Internet :: WWW/HTTP
diff --git a/README.rst b/README.rst
index 40cf0e6..c62abea 100644
--- a/README.rst
+++ b/README.rst
@@ -10,9 +10,6 @@ Simple and nonobstructive jinja2 integration with Django.
 .. image:: https://img.shields.io/pypi/v/django-jinja.svg?style=flat
     :target: https://pypi.python.org/pypi/django-jinja
 
-.. image:: https://img.shields.io/pypi/dm/django-jinja.svg?style=flat
-    :target: https://pypi.python.org/pypi/django-jinja
-
 
 **Documentation:** http://niwinz.github.io/django-jinja/latest/
 
diff --git a/django_jinja.egg-info/PKG-INFO b/django_jinja.egg-info/PKG-INFO
index 328714e..937a284 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.2
+Version: 2.3.0
 Summary: Jinja2 templating language integrated in Django.
 Home-page: https://github.com/niwinz/django-jinja
 Author: Andrey Antukh
@@ -20,4 +20,6 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Internet :: WWW/HTTP
diff --git a/django_jinja/management/commands/makemessages.py b/django_jinja/management/commands/makemessages.py
index 70f0fd2..965881e 100644
--- a/django_jinja/management/commands/makemessages.py
+++ b/django_jinja/management/commands/makemessages.py
@@ -25,10 +25,16 @@ http://stackoverflow.com/questions/2090717/getting-translation-strings-for-jinja
 """
 
 import re
+
+from django import VERSION as DJANGO_VERSION
 from django.core.management.commands import makemessages
-from django.utils.translation import trans_real
 from django.template.base import BLOCK_TAG_START, BLOCK_TAG_END
 
+if DJANGO_VERSION[:2] < (1, 11):
+    from django.utils.translation import trans_real
+else:
+    from django.utils.translation import template as trans_real
+
 strip_whitespace_right = re.compile(r"(%s-?\s*(trans|pluralize).*?-%s)\s+" % (BLOCK_TAG_START, BLOCK_TAG_END), re.U)
 strip_whitespace_left = re.compile(r"\s+(%s-\s*(endtrans|pluralize).*?-?%s)" % (BLOCK_TAG_START, BLOCK_TAG_END), re.U)
 
@@ -53,11 +59,11 @@ class Command(makemessages.Command):
             trans_real.block_re.pattern + '|' + r"""^-?\s*trans(?:\s+(?!'|")(?=.*?=.*?)|\s*-?$)""")
         trans_real.plural_re = re.compile(
             trans_real.plural_re.pattern + '|' + r"""^-?\s*pluralize(?:\s+.+|-?$)""")
-        trans_real.constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?')).*\)""")
+        trans_real.constant_re = re.compile(r"""_\(((?:".*?(?<!\\)")|(?:'.*?(?<!\\)')).*\)""")
 
-        def my_templatize(src, origin=None):
+        def my_templatize(src, origin=None, **kwargs):
             new_src = strip_whitespaces(src)
-            return old_templatize(new_src, origin)
+            return old_templatize(new_src, origin, **kwargs)
 
         trans_real.templatize = my_templatize
 
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/setup.py b/setup.py
index bde8ce6..127caa7 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ if sys.version_info < (2, 7):
 
 setup(
     name = "django-jinja",
-    version = "2.2.2",
+    version = "2.3.0",
     description = "Jinja2 templating language integrated in Django.",
     long_description = "",
     keywords = "django, jinja2",
@@ -58,6 +58,8 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Internet :: WWW/HTTP",
     ]
 )

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