Version 0.4.0 with support for Django 1.11. Closes #23

Author: sastred

.gitignore

@@ -4,6 +4,7 @@
 /django_yubin.egg-info/
 /docs/_build
 .idea/*
+.vscode/
 .eggs/
 .DS_Store
 

.travis.yml

@@ -17,13 +17,16 @@ env:
   - TOXENV=py27-django18
   - TOXENV=py27-django19
   - TOXENV=py27-django110
+  - TOXENV=py27-django111
 
   - TOXENV=py33-django18
 
   - TOXENV=py34-django18
   - TOXENV=py34-django19
   - TOXENV=py34-django110
+  - TOXENV=py34-django111
 
   - TOXENV=py35-django18
   - TOXENV=py35-django19
   - TOXENV=py35-django110
+  - TOXENV=py35-django111

README.rst

@@ -19,15 +19,15 @@ django-yubin
 
 Django Yubin allows the programmer to control when he wants to send the e-mail
 in this application, making the web application to answer fast as it not has to
-wait for the mail server. 
+wait for the mail server.
 
 As in our projects we use always two django packages for dealing with emails:
 django-mailer2 (our own fork in APSL) and django-mailviews to compose the
 emails we decided to create this package to fit our own needs and share with
 the community.
 
 As you can see it seems django-mailer2 is not accepting patches, so in
-order to put a new version on pypi a new name was mandatory.  So django-yubin was born 
+order to put a new version on pypi a new name was mandatory.  So django-yubin was born
 (yubin is postal mail in japanese). The name attribution is for @morenosan.
 
 How it works
@@ -48,8 +48,8 @@ Advantages
 
 * Yubin allows to define prioritary queues, resend e-mails
 
-* Yubin helps in your development.  It's a good way to work when you're developping 
-  the application and you don't want to flood your test users with 
+* Yubin helps in your development.  It's a good way to work when you're developping
+  the application and you don't want to flood your test users with
   e-mails. With Django Yubin, and without running the cron commands, you can see how
   your e-mails are, retrieve them and even delete them with out sending it.
 
@@ -58,7 +58,7 @@ someting like
 
     * * * * * (cd $PROJECT; python manage.py send_mail >> $PROJECT/cron_mail.log 2>&1)
 
-This will send the queued e-mail every minute. 
+This will send the queued e-mail every minute.
 
 Django Yubin is a fork from django-mailer2 with some addtions from django-mailviews and
 additional improvements made from apsl.net that we need for our daly basis workd. It
@@ -81,6 +81,7 @@ You can read the package documentation at http://django-yubin.readthedocs.org/en
 
 Changelog
 ---------
+* 0.4.0       Support Django 1.11: subject and body are no longer unscaped, you need to add {% autoescape off %} to your non HTML templates.
 * 0.3.1       Delete unused template that caused an error with django-compressor offline. testmail command now generates HTML emails.
 * 0.3.0       Support Django >= 1.8 and <=1.10, Python 2.7, 3.3, 3.4 and 3.5. Re-send mails admin action. Fix bug in status_mail command. Demo project configured to send mails with the same mail fake-server used for tests.
 * 0.2.3       Removed {% load url from future %} to support Django 1.9. Now Django < 1.5 is not supported.

demo/demo.sqlite

@@ -4,5 +4,6 @@
 
 from django.views.generic import TemplateView
 
+
 class IndexView(TemplateView):
     template_name = 'index.html'

demo/demo/views.py

@@ -3,22 +3,12 @@
 # ----------------------------------------------------------------------------
 
 import hashlib
-from django.template import Context
 
 
 def unimplemented(*args, **kwargs):
     raise NotImplementedError
 
 
-def unescape(context):
-    """
-    Accepts a context object, returning a new context with autoescape off.
-
-    Useful for rendering plain-text templates without having to wrap the entire
-    template in an `{% autoescape off %}` tag.
-    """
-    return Context(context, autoescape=False)
-
 class Attachment(object):
     """
     Utility class to contain the attachment information

django_yubin/mail_utils.py

@@ -14,9 +14,6 @@
 from django.template.loader import get_template, select_template
 from django.contrib.sites.models import Site
 
-from django_yubin.mail_utils import unescape
-
-
 
 class EmailMessageView(object):
     """
@@ -196,35 +193,28 @@ def _set_body_template(self, template):
     #: will be used instead.
     body_template = property(_get_body_template, _set_body_template)
 
-
     def render_subject(self, context):
         """
         Renders the message subject for the given context.
 
-        The context data is automatically unescaped to avoid rendering HTML
-        entities in ``text/plain`` content.
-
         :param context: The context to use when rendering the subject template.
         :type context: :class:`~django.template.Context`
         :returns: A rendered subject.
         :rtype: :class:`str`
         """
-        rendered = self.subject_template.render(unescape(context))
+        rendered = self.subject_template.render(context)
         return rendered.strip()
 
     def render_body(self, context):
         """
         Renders the message body for the given context.
 
-        The context data is automatically unescaped to avoid rendering HTML
-        entities in ``text/plain`` content.
-
         :param context: The context to use when rendering the body template.
         :type context: :class:`~django.template.Context`
         :returns: A rendered body.
         :rtype: :class:`str`
         """
-        return self.body_template.render(unescape(context))
+        return self.body_template.render(context)
 
 
 class TemplatedHTMLEmailMessageView(TemplatedEmailMessageView):

django_yubin/messages.py

@@ -17,7 +17,7 @@ the next section you'll find information about how to write the test.
 Please follow the PEP8 coventions and in case you write additional features don't
 forget to write the tests for them.
 
-At http://apsl.net we use yubin for most of our own projects, so we'll try to 
+At http://apsl.net we use yubin for most of our own projects, so we'll try to
 mantain it as bug free as stable as possible. That said we can't not guarantee
 that we could patch the program in the way you like, add that new feature, etc.
 
@@ -50,7 +50,7 @@ of the Python versions you have installed in your system (Python 2.7, 3.2 until
 Run ``detox`` if you prefer parallelizing. To run a single environment, you have
 some options::
 
-    $ tox -e py27-django19  # run Python 2.7 and Django 1.9
+    $ tox -e py35-django111  # run Python 3.4 and Django 1.11
 
 or, in a virtualenv for example::
 

docs/contributing.rst

@@ -22,7 +22,7 @@
 
 setup(
     name='django-yubin',
-    version='0.3.1',
+    version='0.4.0',
     description=("A reusable Django app for composing and queueing emails "
                  "Adds django-mailer2 + django-mailviews + others"),
     long_description=long_description,
@@ -55,5 +55,6 @@
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
     ]
 )

setup.py

@@ -1 +1 @@
-{{ body }}
+{% autoescape off %}{{ body }}{% endautoescape %}

tests/tests/templates/mail/body.txt

@@ -1 +1 @@
-{{ subject }}
+{% autoescape off %}{{ subject }}{% endautoescape %}

tests/tests/templates/mail/subject.txt

@@ -73,9 +73,9 @@ def setUp(self):
         self.context = Context(self.context_dict)
 
         self.render_subject = functools.partial(self.message.render_subject,
-            context=self.context)
+                                                context=self.context)
         self.render_body = functools.partial(self.message.render_body,
-            context=self.context)
+                                             context=self.context)
 
     def add_templates_to_message(self):
         """
@@ -99,7 +99,7 @@ def test_subject_template_name(self):
         self.assertTemplateExists(template)
 
         self.message.subject_template_name = template
-        self.assertEqual(self.render_subject(), self.subject)
+        self.assertEqual(self.render_subject(context=self.context_dict), self.subject)
 
     def test_subject_template(self):
         self.message.subject_template = self.subject_template
@@ -120,7 +120,7 @@ def test_body_template_name(self):
         self.assertTemplateExists(template)
 
         self.message.body_template_name = template
-        self.assertEqual(self.render_body(), u"%s\n" % self.body)
+        self.assertEqual(self.render_body(context=self.context_dict), u"%s\n" % self.body)
 
     def test_body_template(self):
         self.message.body_template = self.body_template
@@ -204,7 +204,7 @@ def test_html_body_template_name(self):
         self.assertTemplateExists(template)
 
         self.message.html_body_template_name = template
-        self.assertEqual(self.render_html_body(), u"%s\n" % self.html_body)
+        self.assertEqual(self.render_html_body(context=self.context_dict), u"%s\n" % self.html_body)
 
     def test_html_body_template(self):
         self.message.html_body_template = self.html_body_template
@@ -250,7 +250,8 @@ def add_templates_to_message(self):
     def test_render_to_message(self):
         self.add_templates_to_message()
         attachment = os.path.join(os.path.dirname(__file__), 'files/attachment.pdf'),
-        message = self.message.render_to_message(extra_context=self.context_dict, attachment=attachment,
+        message = self.message.render_to_message(extra_context=self.context_dict,
+                                                 attachment=attachment,
                                                  mimetype="application/pdf")
         self.assertEqual(message.subject, self.subject)
         self.assertEqual(message.body, self.body)
@@ -290,9 +291,9 @@ def setUp(self):
         self.context = Context(self.context_dict)
 
         self.render_subject = functools.partial(self.message.render_subject,
-                                                context=self.context)
+                                                context=self.context_dict)
         self.render_body = functools.partial(self.message.render_body,
-                                             context=self.context)
+                                             context=self.context_dict)
 
     def add_templates_to_message(self):
         """

tests/tests/test_messages.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+urlpatterns = []

tests/urls.py

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,py,33,34,35}-django{18},py{27,py,34,35}-django{19,110}
+envlist = py{27,py,33,34,35}-django{18},py{27,py,34,35}-django{19,110,111}
 skip_missing_interpreters = true
 
 [testenv]
@@ -9,6 +9,7 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<1.12
 commands=
     coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/setup.py test
 	coverage report --omit=*test*