isolated salt.utils.json changes to saltstack#55660

Akm0d · Dec 17, 2019 · 6e3523d · 6e3523d
1 parent 8c99fe9
commit 6e3523d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/salt/modules/saltcheck.py b/salt/modules/saltcheck.py
@@ -144,7 +144,7 @@
 import logging
 import os
 import time
-from salt.utils.json import loads, dumps
+from json import loads, dumps
 
 # Import Salt libs
 import salt.utils.files

diff --git a/salt/states/netsnmp.py b/salt/states/netsnmp.py
@@ -23,8 +23,9 @@
 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

diff --git a/salt/states/netusers.py b/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

diff --git a/salt/states/probes.py b/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

diff --git a/salt/states/zabbix_host.py b/salt/states/zabbix_host.py
@@ -7,7 +7,7 @@
 
 '''
 from __future__ import absolute_import, print_function, unicode_literals
-from salt.utils.json import loads, dumps
+from json import loads, dumps
 from copy import deepcopy
 from salt.ext import six
 

diff --git a/salt/states/zabbix_user.py b/salt/states/zabbix_user.py
@@ -9,7 +9,7 @@
 
 # Import Python libs
 from __future__ import absolute_import, print_function, unicode_literals
-from salt.utils.json import loads, dumps
+from json import loads, dumps
 from copy import deepcopy
 
 # Import Salt libs