Module: check_mk
Branch: master
Commit: 8d23fd1fcbbb947a3858233c2b360653cf75d399
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d23fd1fcbbb94…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 26 10:02:51 2018 +0200
Replaced some simplejson use
Change-Id: I7231f485236de0cc4c3c00b84071f57f741e9b6b
---
web/htdocs/htmllib.py | 8 ++------
web/htdocs/valuespec.py | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 025b97a..3692a82 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -65,15 +65,11 @@ import random
import re
import __builtin__
import signal
+import json
from collections import deque
from contextlib import contextmanager
-try:
- import simplejson as json
-except ImportError:
- import json
-
# Monkey patch in order to make the HTML class below json-serializable without changing
the default json calls.
def _default(self, obj):
return getattr(obj.__class__, "to_json", _default.default)(obj)
@@ -1170,7 +1166,7 @@ class RequestHandler(object):
json_request = self.var("request", "{}")
request = json.loads(json_request)
request["request_format"] = "json"
- except json.JSONDecodeError, e:
+ except ValueError, e: # Python3: json.JSONDecodeError
raise MKUserError("request", _("Failed to parse JSON
request: '%s': %s") %
(json_request, e))
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index ad46ae1..028ae0b 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -36,6 +36,7 @@
# -> Add alternative rendering "dropdown"
import math, os, time, re, sre_constants, urlparse, forms, tempfile, types
+import json
import base64
import hashlib
import socket
@@ -45,11 +46,6 @@ import cmk.defines as defines
from Cryptodome.PublicKey import RSA
from UserDict import DictMixin
-try:
- import simplejson as json
-except ImportError:
- import json
-
def type_name(v):
try:
return type(v).__name__
@@ -737,7 +733,7 @@ class TextAsciiAutocomplete(TextAscii):
try:
params = json.loads(raw_params)
- except json.JSONDecodeError, e:
+ except ValueError, e: # Python 3: json.JSONDecodeError
raise MKUserError("params", _("Invalid parameters: %s") %
e)
value = html.var("value")