launchpad-reviewers team mailing list archive

Thread
Date

[Merge] ~cjwatson/launchpad:py3-librarianserver-static-responses into launchpad:master

To: mp+389444@xxxxxxxxxxxxxxxxxx
From: Colin Watson <cjwatson@xxxxxxxxxxxxx>
Date: Mon, 17 Aug 2020 23:25:40 -0000
Reply-to: mp+389444@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Colin Watson has proposed merging ~cjwatson/launchpad:py3-librarianserver-static-responses into launchpad:master.

Commit message:
Static librarianserver responses are bytes

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/389444

In Python 3, we need to be careful to pass them as such.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-librarianserver-static-responses into launchpad:master.

diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index 994327f..bb0612a 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -38,7 +38,7 @@ from lp.services.librarian.client import url_path_quote
 from lp.services.librarian.utils import guess_librarian_encoding
 
 
-defaultResource = static.Data("""
+defaultResource = static.Data(b"""
         <html>
         <body>
         <h1>Launchpad Librarian</h1>
@@ -316,7 +316,7 @@ class DigestSearchResource(resource.Resource):
         try:
             digest = request.args['digest'][0]
         except LookupError:
-            return static.Data('Bad search', 'text/plain').render(request)
+            return static.Data(b'Bad search', 'text/plain').render(request)
 
         deferred = deferToThread(self._matchingAliases, digest)
         deferred.addCallback(self._cb_matchingAliases, request)
@@ -340,7 +340,7 @@ class DigestSearchResource(resource.Resource):
 
 
 # Ask robots not to index or archive anything in the librarian.
-robotsTxt = static.Data("""
+robotsTxt = static.Data(b"""
 User-agent: *
 Disallow: /
 """, type='text/plain')