Launchpad itself

Merge ~cjwatson/launchpad:py3-twisted-web-child-names into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-twisted-web-child-names
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1eec94495d48c653bdd42344acd37f5e482fc81a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-twisted-web-child-names
Merge into: launchpad:master
Diff against target: 157 lines (+19/-19)
7 files modified
daemons/librarian.tac (+2/-2)
lib/lp/buildmaster/tests/snapbuildproxy.py (+1/-1)
lib/lp/registry/tests/distributionmirror_http_server.py (+6/-6)
lib/lp/services/librarianserver/web.py (+1/-1)
lib/lp/services/twistedsupport/gracefulshutdown.py (+1/-1)
lib/lp/testing/keyserver/web.py (+4/-4)
lib/lp/testing/swift/fakeswift.py (+4/-4)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+386714@code.launchpad.net

Commit message

twisted.web.resource child names are bytes

Description of the change

Twisted 19.7.0 deprecated passing path to Resource.putChild as non-bytes.

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/daemons/librarian.tac b/daemons/librarian.tac
2index bc55c5c..4440621 100644
3--- a/daemons/librarian.tac
4+++ b/daemons/librarian.tac
5@@ -91,8 +91,8 @@ def setUpListener(uploadPort, webPort, restricted):
6 librarianService)
7 root = fatweb.LibraryFileResource(
8 librarian_storage, upstreamHost, upstreamPort)
9- root.putChild('search', fatweb.DigestSearchResource(librarian_storage))
10- root.putChild('robots.txt', fatweb.robotsTxt)
11+ root.putChild(b'search', fatweb.DigestSearchResource(librarian_storage))
12+ root.putChild(b'robots.txt', fatweb.robotsTxt)
13 site = server.Site(root)
14 site.displayTracebacks = False
15 strports.service("tcp:%d" % webPort, site).setServiceParent(
16diff --git a/lib/lp/buildmaster/tests/snapbuildproxy.py b/lib/lp/buildmaster/tests/snapbuildproxy.py
17index 21d973e..fc8893a 100644
18--- a/lib/lp/buildmaster/tests/snapbuildproxy.py
19+++ b/lib/lp/buildmaster/tests/snapbuildproxy.py
20@@ -81,7 +81,7 @@ class InProcessProxyAuthAPIFixture(fixtures.Fixture):
21 def start(self):
22 root = resource.Resource()
23 self.tokens = ProxyAuthAPITokensResource()
24- root.putChild("tokens", self.tokens)
25+ root.putChild(b"tokens", self.tokens)
26 endpoint = endpoints.serverFromString(reactor, nativeString("tcp:0"))
27 site = server.Site(self.tokens)
28 self.addCleanup(site.stopFactory)
29diff --git a/lib/lp/registry/tests/distributionmirror_http_server.py b/lib/lp/registry/tests/distributionmirror_http_server.py
30index a23149c..37b889e 100644
31--- a/lib/lp/registry/tests/distributionmirror_http_server.py
32+++ b/lib/lp/registry/tests/distributionmirror_http_server.py
33@@ -37,15 +37,15 @@ class DistributionMirrorTestHTTPServer(Resource):
34 def getChild(self, name, request):
35 protocol = self.protocol
36 port = request.getHost().port
37- if name == 'valid-mirror':
38+ if name == b'valid-mirror':
39 leaf = self.__class__()
40 leaf.isLeaf = True
41 return leaf
42- elif name == 'timeout':
43+ elif name == b'timeout':
44 return NeverFinishResource()
45- elif name == 'error':
46+ elif name == b'error':
47 return FiveHundredResource()
48- elif name == 'redirect-to-valid-mirror':
49+ elif name == b'redirect-to-valid-mirror':
50 assert request.path != name, (
51 'When redirecting to a valid mirror the path must have more '
52 'than one component.')
53@@ -55,11 +55,11 @@ class DistributionMirrorTestHTTPServer(Resource):
54 protocol, port, remaining_path))
55 leaf.isLeaf = True
56 return leaf
57- elif name == 'redirect-infinite-loop':
58+ elif name == b'redirect-infinite-loop':
59 return RedirectingResource(
60 '%s://localhost:%s/redirect-infinite-loop' %
61 (protocol, port))
62- elif name == 'redirect-unknown-url-scheme':
63+ elif name == b'redirect-unknown-url-scheme':
64 return RedirectingResource(
65 'ssh://localhost/redirect-unknown-url-scheme')
66 else:
67diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
68index 90001dc..40013dd 100644
69--- a/lib/lp/services/librarianserver/web.py
70+++ b/lib/lp/services/librarianserver/web.py
71@@ -68,7 +68,7 @@ class LibraryFileResource(resource.Resource):
72 self.upstreamPort = upstreamPort
73
74 def getChild(self, name, request):
75- if name == '':
76+ if name == b'':
77 # Root resource
78 return defaultResource
79 try:
80diff --git a/lib/lp/services/twistedsupport/gracefulshutdown.py b/lib/lp/services/twistedsupport/gracefulshutdown.py
81index bd21da5..bbd1b0c 100644
82--- a/lib/lp/services/twistedsupport/gracefulshutdown.py
83+++ b/lib/lp/services/twistedsupport/gracefulshutdown.py
84@@ -169,6 +169,6 @@ def make_web_status_service(strport, tracking_factories):
85 """
86 server_available_resource = ServerAvailableResource(tracking_factories)
87 web_root = resource.Resource()
88- web_root.putChild('', server_available_resource)
89+ web_root.putChild(b'', server_available_resource)
90 web_factory = server.Site(web_root)
91 return strports.service(strport, web_factory)
92diff --git a/lib/lp/testing/keyserver/web.py b/lib/lp/testing/keyserver/web.py
93index 0ad0926..faac2e8 100644
94--- a/lib/lp/testing/keyserver/web.py
95+++ b/lib/lp/testing/keyserver/web.py
96@@ -82,7 +82,7 @@ class _BaseResource(Resource):
97
98 def getChild(self, name, request):
99 """Redirect trailing slash correctly."""
100- if name == '':
101+ if name == b'':
102 return self
103 return Resource.getChild(
104 self, name, request)
105@@ -93,7 +93,7 @@ class KeyServerResource(_BaseResource):
106
107 def __init__(self, root):
108 _BaseResource.__init__(self)
109- self.putChild('pks', PksResource(root))
110+ self.putChild(b'pks', PksResource(root))
111
112 def render_GET(self, request):
113 return GREETING
114@@ -103,8 +103,8 @@ class PksResource(_BaseResource):
115
116 def __init__(self, root):
117 _BaseResource.__init__(self)
118- self.putChild('lookup', LookUp(root))
119- self.putChild('add', SubmitKey(root))
120+ self.putChild(b'lookup', LookUp(root))
121+ self.putChild(b'add', SubmitKey(root))
122
123 def render_GET(self, request):
124 return 'Welcome To Fake SKS service.\n'
125diff --git a/lib/lp/testing/swift/fakeswift.py b/lib/lp/testing/swift/fakeswift.py
126index e9eb5b7..eedaa77 100644
127--- a/lib/lp/testing/swift/fakeswift.py
128+++ b/lib/lp/testing/swift/fakeswift.py
129@@ -102,7 +102,7 @@ class FakeKeystone(resource.Resource):
130
131 def getChild(self, path, request):
132 """See `twisted.web.resource.Resource.getChild`."""
133- if path in ("v2.0", "tokens"):
134+ if path in (b"v2.0", b"tokens"):
135 return self
136 return resource.NoResource("Not a valid keystone URL.")
137
138@@ -522,7 +522,7 @@ class FakeSwift(resource.Resource):
139
140 def getChild(self, name, request):
141 """See `twisted.web.resource.Resource.getChild`."""
142- if name == "v1" or name.startswith("AUTH_"):
143+ if name == b"v1" or name.startswith(b"AUTH_"):
144 return self
145
146 resource = self._getResource(name, request)
147@@ -556,8 +556,8 @@ class Root(resource.Resource):
148 self.keystone = FakeKeystone(
149 self, allow_default_access=allow_default_access)
150 self.swift = FakeSwift(self)
151- self.putChild("keystone", self.keystone)
152- self.putChild("swift", self.swift)
153+ self.putChild(b"keystone", self.keystone)
154+ self.putChild(b"swift", self.swift)
155
156 def getCatalog(self, tenant, request):
157 """Compute service catalog for the given request and tenant."""

Subscribers

People subscribed via source and target branches

to status/vote changes: