Launchpad itself

Merge ~cjwatson/launchpad:py3-more-xmlrpc-proxy-bytes into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-more-xmlrpc-proxy-bytes
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: f02aada8df64cb0a0292b56c56e19546be8a0f5b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-more-xmlrpc-proxy-bytes
Merge into: launchpad:master
Diff against target: 14 lines (+3/-2)
1 file modified
lib/lp/codehosting/sshserver/daemon.py (+3/-2)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+395292@code.launchpad.net

Commit message

Encode URL to bytes for twisted.web.xmlrpc.Proxy (again)

Description of the change

Missed in 389759dcf38da9e1d2006dfcd2d46cb017f6e88e.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/codehosting/sshserver/daemon.py b/lib/lp/codehosting/sshserver/daemon.py
2index 3d6a429..a5ab6c5 100644
3--- a/lib/lp/codehosting/sshserver/daemon.py
4+++ b/lib/lp/codehosting/sshserver/daemon.py
5@@ -104,6 +104,7 @@ def make_portal():
6 avatars (see `CodehostingAvatar`).
7 """
8 authentication_proxy = Proxy(
9- config.codehosting.authentication_endpoint)
10- codehosting_proxy = Proxy(config.codehosting.codehosting_endpoint)
11+ config.codehosting.authentication_endpoint.encode('UTF-8'))
12+ codehosting_proxy = Proxy(
13+ config.codehosting.codehosting_endpoint.encode('UTF-8'))
14 return get_portal(authentication_proxy, codehosting_proxy)

Subscribers

People subscribed via source and target branches

to status/vote changes: