Control: tags 951969 + patch Control: tags 951969 + pending Dear maintainer,
I've prepared an NMU for social-auth-app-django (versioned as 3.1.0-2.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru social-auth-app-django-3.1.0/debian/changelog social-auth-app-django-3.1.0/debian/changelog --- social-auth-app-django-3.1.0/debian/changelog 2019-02-02 11:46:31.000000000 +0200 +++ social-auth-app-django-3.1.0/debian/changelog 2020-04-24 16:24:40.000000000 +0300 @@ -1,3 +1,10 @@ +social-auth-app-django (3.1.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add upstream fix for Django 2.2. (Closes: #951969) + + -- Adrian Bunk <b...@debian.org> Fri, 24 Apr 2020 16:24:40 +0300 + social-auth-app-django (3.1.0-2) unstable; urgency=medium * Team upload. diff -Nru social-auth-app-django-3.1.0/debian/patches/0001-Fix-render_html-on-Django-2.2.patch social-auth-app-django-3.1.0/debian/patches/0001-Fix-render_html-on-Django-2.2.patch --- social-auth-app-django-3.1.0/debian/patches/0001-Fix-render_html-on-Django-2.2.patch 1970-01-01 02:00:00.000000000 +0200 +++ social-auth-app-django-3.1.0/debian/patches/0001-Fix-render_html-on-Django-2.2.patch 2020-04-24 16:01:12.000000000 +0300 @@ -0,0 +1,28 @@ +From f8d674d9ac2da7683ff902a58d514ea5d1eb5b7b Mon Sep 17 00:00:00 2001 +From: John Vandenberg <jay...@gmail.com> +Date: Wed, 10 Apr 2019 20:08:38 +0700 +Subject: Fix render_html on Django 2.2 + +Update render_html to also catch TypeError. + +Fixes https://github.com/python-social-auth/social-app-django/issues/196 +--- + social_django/strategy.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/social_django/strategy.py b/social_django/strategy.py +index 1a3a820..b706afb 100644 +--- a/social_django/strategy.py ++++ b/social_django/strategy.py +@@ -97,7 +97,7 @@ class DjangoStrategy(BaseStrategy): + 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): +-- +2.20.1 + diff -Nru social-auth-app-django-3.1.0/debian/patches/series social-auth-app-django-3.1.0/debian/patches/series --- social-auth-app-django-3.1.0/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ social-auth-app-django-3.1.0/debian/patches/series 2020-04-24 16:24:40.000000000 +0300 @@ -0,0 +1 @@ +0001-Fix-render_html-on-Django-2.2.patch
