launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-builder-download-file into launchpad:master.

Commit message:
Fix downloading files from builders on Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

DownloadCommand expects the URL as text, so send it as such.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-builder-download-file into launchpad:master.

diff --git a/lib/lp/buildmaster/interactor.py b/lib/lp/buildmaster/interactor.py
index c0afe10..b786a6d 100644
--- a/lib/lp/buildmaster/interactor.py
+++ b/lib/lp/buildmaster/interactor.py
@@ -222,7 +222,7 @@ class BuilderSlave(object):
 
     def getURL(self, sha1):
         """Get the URL for a file on the builder with a given SHA-1."""
-        return urlappend(self._file_cache_url, sha1).encode('utf8')
+        return urlappend(self._file_cache_url, sha1)
 
     @defer.inlineCallbacks
     def getFile(self, sha_sum, path_to_write, logger=None):