Merge ~ltrager/maas:lp1843759 into maas:master

[Lee Trager]

LP: #1843759 - Don't convert JSONObjectField into a string when dehydrating.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1843759 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/6449/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1843759 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/6450/console
COMMIT: 436a4177c05a842d25b83499bb0b8bdf90bd72c1

review: Needs Fixing

20065b4... by Lee Trager on 2019-09-20

Fix lint

diff --git a/src/maasserver/websockets/base.py b/src/maasserver/websockets/base.py
index 61abc7a..9cc9ffe 100644
--- a/src/maasserver/websockets/base.py
+++ b/src/maasserver/websockets/base.py
@@ -210,7 +210,7 @@ class Handler(metaclass=HandlerMetaclass):
                 data[field_name] = dehydrate_method(field_obj)
             else:
                 value = field.value_from_object(obj)
-                if is_protected_type(value):
+                if is_protected_type(value) or isinstance(value, dict):
                     data[field_name] = value
                 elif isinstance(field, ArrayField):
                     data[field_name] = field.to_python(value)
diff --git a/src/maasserver/websockets/handlers/script.py b/src/maasserver/websockets/handlers/script.py
index 872db05..971c55b 100644
--- a/src/maasserver/websockets/handlers/script.py
+++ b/src/maasserver/websockets/handlers/script.py
@@ -1,7 +1,7 @@
-# Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""The DHCPSnippet handler for the WebSocket connection."""
+"""The Script handler for the WebSocket connection."""
 
 __all__ = [
     "ScriptHandler",
diff --git a/src/maasserver/websockets/handlers/tests/test_script.py b/src/maasserver/websockets/handlers/tests/test_script.py
index 1108d6d..7246ef7 100644
--- a/src/maasserver/websockets/handlers/tests/test_script.py
+++ b/src/maasserver/websockets/handlers/tests/test_script.py
@@ -5,7 +5,6 @@
 
 __all__ = []
 
-import json
 
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
@@ -25,9 +24,9 @@ class TestScriptHandler(MAASServerTestCase):
             'script_type': script.script_type,
             'hardware_type': script.hardware_type,
             'parallel': script.parallel,
-            'results': json.dumps(script.results),
-            'parameters': json.dumps(script.parameters),
-            'packages': json.dumps(script.packages),
+            'results': script.results,
+            'parameters': script.parameters,
+            'packages': script.packages,
             'timeout': '0%s' % str(script.timeout),
             'destructive': script.destructive,
             'default': script.default,
@@ -43,8 +42,9 @@ class TestScriptHandler(MAASServerTestCase):
     def test_list(self):
         user = factory.make_User()
         handler = ScriptHandler(user, {}, None)
+        parameters = {'interface': {'type': 'interface'}}
         expected_scripts = sorted([
-            self.dehydrate_script(factory.make_Script())
+            self.dehydrate_script(factory.make_Script(parameters=parameters))
             for _ in range(3)
         ], key=lambda i: i['id'])
         sorted_results = sorted(handler.list({}), key=lambda i: i['id'])