Module: check_mk
Branch: master
Commit: 9aec4a50b760256ab913ab82d1a45708c1f14a77
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9aec4a50b76025…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Apr 4 22:22:26 2018 +0200
Cleaned up more json imports
htdocs/htmllib.py patches the default JSON encoder to make it able
to serialize the special type HTML(). The commit 8d23fd1fcbb changed
the htmllib.py to only use the python builtin json module.
To get the correct overriden json.JSONEncoder, all other parts of the
GUI also need to use the builtin json over the simplejson module.
Change-Id: I8dcfafa738c2fc2f7c9b1c487389bdf2c56ad8b8
---
web/htdocs/backup.py | 6 +-----
web/htdocs/crash_reporting.py | 5 +----
web/htdocs/dashboard.py | 5 +----
web/htdocs/help.py | 6 +-----
web/htdocs/inventory.py | 6 +-----
web/htdocs/metrics.py | 5 +----
web/htdocs/prediction.py | 6 +-----
web/htdocs/sidebar.py | 6 +-----
web/htdocs/wato.py | 6 +-----
web/htdocs/webapi.py | 5 +----
web/plugins/dashboard/dashlets.py | 5 +----
web/plugins/views/webservice.py | 5 +----
12 files changed, 12 insertions(+), 54 deletions(-)
diff --git a/web/htdocs/backup.py b/web/htdocs/backup.py
index 5276533..556b099 100644
--- a/web/htdocs/backup.py
+++ b/web/htdocs/backup.py
@@ -37,11 +37,7 @@ import signal
import socket
import subprocess
import time
-
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
import table
import key_mgmt
diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py
index 30fa8a5..39cbe59 100644
--- a/web/htdocs/crash_reporting.py
+++ b/web/htdocs/crash_reporting.py
@@ -32,10 +32,7 @@ from valuespec import *
import table, config, forms
import cmk.crash_reporting
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
def page_crashed(what):
if what == "check":
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index dc5fc19..29a0184 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -29,10 +29,7 @@ from valuespec import *
from lib import *
import wato
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
loaded_with_language = False
builtin_dashboards = {}
diff --git a/web/htdocs/help.py b/web/htdocs/help.py
index 3f225a9..d9e7cbd 100644
--- a/web/htdocs/help.py
+++ b/web/htdocs/help.py
@@ -25,11 +25,7 @@
# Boston, MA 02110-1301 USA.
import config
-
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
def ajax_switch_help():
state = html.var("enabled", "") != ""
diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py
index f52894f..5fe8547 100644
--- a/web/htdocs/inventory.py
+++ b/web/htdocs/inventory.py
@@ -27,11 +27,7 @@
import re
import os
-
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
import ast
import config
diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py
index 74269dc..c57d8b7 100644
--- a/web/htdocs/metrics.py
+++ b/web/htdocs/metrics.py
@@ -45,10 +45,7 @@ from valuespec import *
import livestatus
from cmk.regex import regex
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
# .--Plugins-------------------------------------------------------------.
# | ____ _ _ |
diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py
index e37f1d0..56a1b4e 100644
--- a/web/htdocs/prediction.py
+++ b/web/htdocs/prediction.py
@@ -26,6 +26,7 @@
import os
import time
+import json
import cmk.paths
import config
@@ -33,11 +34,6 @@ import sites
from lib import *
import cmk.store as store
-try:
- import simplejson as json
-except ImportError:
- import json
-
graph_size = 2000, 700
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index b1028fb..9aa52a0 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -37,11 +37,7 @@ from log import logger
import cmk.paths
import cmk.store as store
-
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
# Constants to be used in snapins
snapin_width = 230
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 7e88e98..5bb420a 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -114,11 +114,7 @@ if cmk.is_managed_edition():
else:
managed = None
-
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
g_html_head_open = False
display_options = None
diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py
index e222c40..3b63cb1 100644
--- a/web/htdocs/webapi.py
+++ b/web/htdocs/webapi.py
@@ -38,10 +38,7 @@ if cmk.is_managed_edition():
else:
managed = None
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
api_actions = {}
loaded_with_language = False
diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py
index 3a23c7a..0801068 100644
--- a/web/plugins/dashboard/dashlets.py
+++ b/web/plugins/dashboard/dashlets.py
@@ -24,10 +24,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
import sites, notify, table
import livestatus
diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py
index cfb35f5..7bf0100 100644
--- a/web/plugins/views/webservice.py
+++ b/web/plugins/views/webservice.py
@@ -24,10 +24,7 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-try:
- import simplejson as json
-except ImportError:
- import json
+import json
def render_python_raw(data, view, group_cells, cells, num_columns, show_checkboxes):
html.write(repr(data))