← Back to branch summary

~allenap/maas/xxx-a-thon

« back to all changes in this revision

Viewing changes to src/maasserver/api/pxeconfig.py

  • Committer: MAAS Lander
  • Author(s): Gavin Panella
  • Date: 2016-02-11 12:25:26 UTC
  • mfrom: (4650.1.1 remove-simplejson)
  • Revision ID: maas_lander-20160211122526-21bdxd2jqitaqjtm
[r=blake-rouse,andreserl][bug=1543828][author=allenap] Remove simplejson as a dependency; use the stdlib's json module instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/pxeconfig.py
7
7
    'pxeconfig',
8
8
    ]
9
9
 
10
 
 
11
10
import http.client
 
11
import json
12
12
 
13
13
from crochet import TimeoutError
14
14
from django.http import HttpResponse
40
40
from provisioningserver.events import EVENT_TYPES
41
41
from provisioningserver.kernel_opts import KernelParameters
42
42
from provisioningserver.rpc.exceptions import NoConnectionsAvailable
43
 
import simplejson as json
44
43
 
45
44
 
46
45
def find_rack_controller_for_pxeconfig_request(request):
222
221
        preseed_url = compose_enlistment_preseed_url(
223
222
            rack_controller=rack_controller)
224
223
        hostname = 'maas-enlist'
225
 
        domain = b'local'
 
224
        domain = 'local'
226
225
 
227
226
        arch = get_optional_param(request.GET, 'arch')
228
227
        if arch is None: