← Back to branch summary

~allenap/maas/rpc-info-to-async

« back to all changes in this revision

Viewing changes to src/provisioningserver/pserv_services/tftp.py

  • Committer: MAAS Lander
  • Author(s): Blake Rouse
  • Date: 2015-12-10 12:59:19 UTC
  • mfrom: (4547.3.1 make-booting-work)
  • Revision ID: maas_lander-20151210125919-dp0irb562b2r6v2y
[r=allenap][bug=][author=blake-rouse] Fix virsh power driver to work. Fix TFTP server in clusterd to work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/pserv_services/tftp.py
21
21
    urlparse,
22
22
)
23
23
 
 
24
from apiclient.utils import ascii_url
24
25
from netaddr import IPAddress
25
26
from provisioningserver.boot import (
26
27
    BootMethodRegistry,
139
140
        query.update(params)
140
141
        # Merge updated query into the generator URL.
141
142
        url = self.generator_url._replace(query=urlencode(query))
142
 
        # TODO: do something more intelligent with unicode URLs here; see
143
 
        # apiclient.utils.ascii_url() for inspiration.
144
 
        return url.geturl()
 
143
        return ascii_url(url.geturl())
145
144
 
146
145
    @inlineCallbacks
147
146
    @typed
168
167
            return KernelParameters(**data)
169
168
 
170
169
        d = self.get_page(url)
 
170
        d.addCallback(lambda data: data.decode("ascii"))
171
171
        d.addCallback(json.loads)
172
172
        d.addCallback(reassemble)
173
173
        return d