Merge 8386098 into 9e49f34

.travis.yml

@@ -9,19 +9,35 @@ env:
   - TOXENV=py27-django19-test
   - TOXENV=py27-django110-test
   - TOXENV=py27-django111-test
+  - TOXENV=py33-django15-test
+  - TOXENV=py33-django16-test
+  - TOXENV=py33-django17-test
+  - TOXENV=py33-django18-test
+  - TOXENV=py34-django15-test
   - TOXENV=py34-django16-test
   - TOXENV=py34-django17-test
   - TOXENV=py34-django18-test
   - TOXENV=py34-django19-test
   - TOXENV=py34-django110-test
   - TOXENV=py34-django111-test
+  - TOXENV=py34-django20-test
   - TOXENV=py35-django18-test
   - TOXENV=py35-django19-test
   - TOXENV=py35-django110-test
   - TOXENV=py35-django111-test
+  - TOXENV=py35-django20-test
+  - TOXENV=py36-django18-test
+  - TOXENV=py36-django19-test
+  - TOXENV=py36-django110-test
+  - TOXENV=py36-django111-test
+  - TOXENV=py36-django20-test
   - TOXENV=py27-flake
+  - TOXENV=py33-flake
   - TOXENV=py34-flake
-  - TOXENV=checkmanifest
+  - TOXENV=py35-flake
+  - TOXENV=py36-flake
+  - TOXENV=py27-checkmanifest
+  - TOXENV=py36-checkmanifest
 install:
   - pip install coveralls tox>=2.1
 script:

mailer/models.py

@@ -80,9 +80,11 @@ def retry_deferred(self, new_priority=PRIORITY_MEDIUM):
 
 
 def email_to_db(email):
-    # pickle.dumps returns essentially binary data which we need to encode
-    # to store in a unicode field.
-    return base64_encode(pickle.dumps(email))
+    # pickle.dumps returns essentially binary data which we need to base64
+    # encode to store in a unicode field. finally we encode back to make sure
+    # we only try to insert unicode strings into the db, since we use a
+    # TextField
+    return base64_encode(pickle.dumps(email)).decode('ascii')
 
 
 def db_to_email(data):

tox.ini

@@ -3,10 +3,10 @@
 envlist =
     py27-django{14,15,16,17,18,19,110,111}-test,
     py33-django{15,16,17,18}-test,
-    py34-django{15,16,17,18,19,110,111}-test,
-    py35-django{18,19,110,111}-test,
-    {py27,py33,py34,py35}-flake,
-    checkmanifest,
+    py34-django{15,16,17,18,19,110,111,20}-test,
+    {py35,py36}-django{18,19,110,111,20}-test,
+    {py27,py33,py34,py35,py36}-flake,
+    {py27,py36}-checkmanifest,
 
 [flake8]
 max-line-length=100
@@ -19,6 +19,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 commands =
     test: coverage run ./runtests.py
     flake: flake8 --statistics --benchmark mailer
@@ -30,16 +31,18 @@ deps =
     django15: Django==1.5.12
     django16: Django==1.6.11
     django17: Django==1.7.11
-    django18: Django==1.8.17
-    django19: Django==1.9.12
-    django110: Django==1.10.5
-    django111: Django==1.11.4
+    django18: Django==1.8.18
+    django19: Django==1.9.13
+    django110: Django==1.10.8
+    django111: Django==1.11.8
+    django20: Django==2.0
     flake: flake8==3.2.1
     py27-flake: Django<2.0
 
 [testenv:checkmanifest]
 basepython = python2.7
 deps =
-     check-manifest
-     Django<2.0
+    check-manifest
+    py27: Django<2.0
+    py36: Django
 commands = check-manifest