Merge branch 'fix/utf8-changelog-rfs-template' of salsa.debian.org:lyknode-guest/debexpo into live

MR: !90


Signed-off-by: Mattia Rizzolo <mattia@debian.org>

debexpo/controllers/sponsor.py

@@ -327,7 +327,8 @@ class SponsorController(BaseController):
         # This is a workaround for Thunderbird and some other clients
         # not handling properly '+' in the mailto body parameter.
         c.mailbody = render('/sponsor/rfs_template.mako')
-        c.mailbody = urllib.quote_plus(c.mailbody).replace('+', '%20')
+        c.mailbody = urllib.quote_plus(c.mailbody.encode('utf-8')) \
+            .replace('+', '%20')
 
         return render('/sponsor/rfs_howto.mako')
 

debexpo/tests/importer/plugins/test_rfstemplate.py

@@ -40,6 +40,17 @@ class TestPluginRFSTemplate(TestImporterController):
     def __init__(self, *args, **kwargs):
         TestImporterController.__init__(self, *args, **kwargs)
 
+    def test_utf8_changelog(self):
+        self.import_source_package('hello-utf8-changelog')
+        self.assert_importer_succeeded()
+        self.assert_package_severity('hello', 'rfstemplate',
+                                     PLUGIN_SEVERITY_INFO)
+        self.assert_rfs_content('hello',
+                                'Subject: RFS: hello/1.0-1 -- Test package for '
+                                'debexpo')
+        self.assert_rfs_content('hello',
+                                'Severity: normal')
+
     def test_dep5_license(self):
         self.import_source_package('hello')
         self.assert_importer_succeeded()

debexpo/tests/importer/sources/hello-utf8-changelog/debian/changelog

+hello (1.0-1) unstable; urgency=medium
+
+  * This is an UTF-8 changelog entry: é,ü,Й
+  * Initial release (Closes: #0)
+
+ -- Vincent TIME <vtime@example.org>  Sun, 02 Dec 2018 22:38:11 +0100

debexpo/tests/importer/sources/hello-utf8-changelog/debian/compat

+../../hello/debian/compat
\ No newline at end of file

debexpo/tests/importer/sources/hello-utf8-changelog/debian/control

+../../hello/debian/control
\ No newline at end of file

debexpo/tests/importer/sources/hello-utf8-changelog/debian/copyright

+../../hello/debian/copyright
\ No newline at end of file

debexpo/tests/importer/sources/hello-utf8-changelog/debian/rules

+../../hello/debian/rules
\ No newline at end of file

debexpo/tests/importer/sources/hello-utf8-changelog/debian/source

+../../hello/debian/source
\ No newline at end of file