Use packaged json module for ThreadsafeProxy

salt/modules/azurearm_resource.py

@@ -48,7 +48,7 @@
 
 # Python libs
 from __future__ import absolute_import
-from json import loads, dumps
+from salt.utils.json import loads, dumps
 import logging
 
 # Azure libs

salt/modules/mssql.py

@@ -23,7 +23,7 @@
 
 # Import python libs
 from __future__ import absolute_import, print_function, unicode_literals
-from json import JSONEncoder, loads
+from salt.utils.json import JSONEncoder, loads
 
 import salt.ext.six as six
 

salt/modules/saltcheck.py

@@ -144,7 +144,7 @@
 import logging
 import os
 import time
-from json import loads, dumps
+from salt.utils.json import loads, dumps
 
 # Import Salt libs
 import salt.utils.files

salt/netapi/rest_tornado/saltnado.py

@@ -223,7 +223,7 @@
 )
 
 salt.utils.zeromq.install_zmq()
-json = salt.utils.json.import_json()
+_json = salt.utils.json.import_json()
 log = logging.getLogger(__name__)
 
 
@@ -233,7 +233,7 @@ def _json_dumps(obj, **kwargs):
     salt.utils.json.import_json(). This ensures that we properly encode any
     strings in the object before we perform the serialization.
     '''
-    return salt.utils.json.dumps(obj, _json_module=json, **kwargs)
+    return salt.utils.json.dumps(obj, _json_module=_json, **kwargs)
 
 # The clients rest_cherrypi supports. We want to mimic the interface, but not
 #     necessarily use the same API under the hood

salt/states/netsnmp.py

@@ -23,9 +23,8 @@
 import logging
 log = logging.getLogger(__name__)
 
-from json import loads, dumps
-
 # salt lib
+from salt.utils.json import loads, dumps
 from salt.ext import six
 # import NAPALM utils
 import salt.utils.napalm

salt/states/netusers.py

@@ -25,9 +25,9 @@
 
 # Python std lib
 from copy import deepcopy
-from json import loads, dumps
 
 # salt lib
+from salt.utils.json import loads, dumps
 from salt.ext import six
 # import NAPALM utils
 import salt.utils.napalm

salt/states/probes.py

@@ -25,9 +25,9 @@
 log = logging.getLogger(__name__)
 
 from copy import deepcopy
-from json import loads, dumps
 
 # salt modules
+from salt.utils.json import loads, dumps
 from salt.ext import six
 # import NAPALM utils
 import salt.utils.napalm

salt/states/zabbix_host.py

@@ -7,7 +7,7 @@
 
 '''
 from __future__ import absolute_import, print_function, unicode_literals
-from json import loads, dumps
+from salt.utils.json import loads, dumps
 from copy import deepcopy
 from salt.ext import six
 

salt/states/zabbix_user.py

@@ -9,7 +9,7 @@
 
 # Import Python libs
 from __future__ import absolute_import, print_function, unicode_literals
-from json import loads, dumps
+from salt.utils.json import loads, dumps
 from copy import deepcopy
 
 # Import Salt libs

salt/utils/json.py

@@ -20,6 +20,10 @@
 log = logging.getLogger(__name__)
 
 
+# One to one mappings
+JSONEncoder = json.JSONEncoder
+
+
 def __split(raw):
     '''
     Performs a splitlines on the string. This function exists to make mocking