[LNT] r307709 - Get json encoder from flask

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Jul 11 13:58:36 2017
New Revision: 307709

URL: http://llvm.org/viewvc/llvm-project?rev=307709&view=rev
Log:
Get json encoder from flask

Flask seems to be switching between simplejson and json. Instead of
duplicating this magic in LNT import whatever flask is using.

Modified:
    lnt/trunk/lnt/server/ui/app.py

Modified: lnt/trunk/lnt/server/ui/app.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/app.py?rev=307709&r1=307708&r2=307709&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/app.py (original)
+++ lnt/trunk/lnt/server/ui/app.py Tue Jul 11 13:58:36 2017
@@ -1,8 +1,4 @@
 import StringIO
-try:
-    import simplejson as json
-except ImportError:
-    import json
 import logging
 import logging.handlers
 import sys
@@ -47,7 +43,7 @@ class RootSlashPatchMiddleware(object):
         return self.app(environ, start_response)
 
 
-class LNTObjectJSONEncoder(json.JSONEncoder):
+class LNTObjectJSONEncoder(flask.json.JSONEncoder):
     """Take SQLAlchemy objects and jsonify them. If the object has an __json__ method, use that instead."""
 
     def __init__(self,  *args, **kwargs):
@@ -66,14 +62,14 @@ class LNTObjectJSONEncoder(json.JSONEnco
                     fields[field] = data.isoformat()
                 else:
                     try:
-                        json.dumps(data)
+                        flask.json.dumps(data)
                         fields[field] = data
                     except TypeError:
                         fields[field] = None
 
             return fields
 
-        return json.JSONEncoder.default(self, obj)
+        return flask.json.JSONEncoder.default(self, obj)
 
 
 class Request(flask.Request):