From edae2d9faa65991ab8280f572c5caefca5375c8d Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Mon, 14 Sep 2020 12:31:46 +0200 Subject: [PATCH] py3: send base64 document as str in storeResource (#46576) --- passerelle_minint/minint_maarch/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/passerelle_minint/minint_maarch/views.py b/passerelle_minint/minint_maarch/views.py index ddc28d9..6833927 100644 --- a/passerelle_minint/minint_maarch/views.py +++ b/passerelle_minint/minint_maarch/views.py @@ -21,8 +21,9 @@ import re import requests from django.views.generic import DetailView as GenericDetailView -from django.utils.decorators import method_decorator from django.utils import six +from django.utils.decorators import method_decorator +from django.utils.encoding import force_text from django.utils.six.moves.urllib import parse as urlparse from django.views.decorators.csrf import csrf_exempt @@ -167,7 +168,7 @@ class ResourceView(DetailView): if page and not empty_page: # add last page, if it contains values document += page document += '' - encodedFile = base64.b64encode(document.encode('utf-8')) + encodedFile = force_text(base64.b64encode(document.encode('utf-8'))) fileFormat = 'html' if debug: @@ -571,7 +572,7 @@ class DebugView(DetailView): document += page document += '' logger.debug('DOCUMENT HTML %r ', document) - encodedFile = base64.b64encode(document.encode('utf-8')) + encodedFile = force_text(base64.b64encode(document.encode('utf-8'))) fileFormat = 'html' if debug: