Merge pull request python-social-auth#197 from jayvdb/dj2.2

Django 2.2
dcartist · Jun 5, 2019 · 27dbe77 · 27dbe77
2 parents ce15088 + 7626719
commit 27dbe77
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,21 +16,40 @@ env:
   - TOX_ENV=py35-django-111
   - TOX_ENV=py34-django-111
   - TOX_ENV=py27-django-111
-  - TOX_ENV=py35-django-master
+  - TOX_ENV=py34-django-20
   - TOX_ENV=py35-django-20
+  - TOX_ENV=py35-django-21
 
 matrix:
   fast_finish: true
   include:
     - python: 3.6
       env: TOX_ENV=py36-django-111
     - python: 3.6
-      env: TOX_ENV=py36-django-master
+      env: TOX_ENV=py36-django-20,py36-django-21
+    - python: 3.5
+      env: TOX_ENV=py35-django-22
+      dist: xenial
+      sudo: true
+    - python: 3.6
+      dist: xenial
+      sudo: true
+      env: TOX_ENV=py36-django-22
     - python: 3.6
-      env: TOX_ENV=py36-django-20
+      dist: xenial
+      sudo: true
+      env: TOX_ENV=py36-django-master
+    - python: 3.7
+      env: TOX_ENV=py37-django-21,py37-django-22
+      dist: xenial
+      sudo: true
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: TOX_ENV=py37-django-master
   allow_failures:
-    - env: TOX_ENV=py35-django-master
     - env: TOX_ENV=py36-django-master
+    - env: TOX_ENV=py37-django-master
 
 install: pip install -r dev-requirements.txt
 

diff --git a/social_django/strategy.py b/social_django/strategy.py
@@ -97,7 +97,7 @@ def render_html(self, tpl=None, html=None, context=None):
         try:
             template = loader.get_template(tpl)
             return template.render(context=context, request=self.request)
-        except TemplateDoesNotExist:
+        except (TypeError, TemplateDoesNotExist):
             return render_template_string(self.request, html, context)
 
     def authenticate(self, backend, *args, **kwargs):

diff --git a/tox.ini b/tox.ini
@@ -6,6 +6,8 @@ envlist =
     {py27,py34,py35,py36}-django-111
     {py35,py36}-django-master
     {py35,py36}-django-20
+    {py35,py36,py37}-django-21
+    {py35,py36,py37}-django-22
 
 [testenv]
 install_command = pip install --pre {opts} {packages}
@@ -19,9 +21,12 @@ deps =
     django-111: Django>=1.11,<2
     django-master: https://github.com/django/django/archive/master.tar.gz
     django-20: Django>=2.0b1,<2.1
+    django-21: Django>=2.1,<2.2
+    django-22: Django>=2.2,<2.3
     -r{toxinidir}/dev-requirements.txt
 
 basepython =
+    py37: python3.7
     py36: python3.6
     py35: python3.5
     py34: python3.4