[LNT] r307324 - Remove simplejson stuff
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 6 15:06:29 PDT 2017
Author: matze
Date: Thu Jul 6 15:06:29 2017
New Revision: 307324
URL: http://llvm.org/viewvc/llvm-project?rev=307324&view=rev
Log:
Remove simplejson stuff
python 2.7 is a requirement nowadays and already comes with the `json`
package.
Modified:
lnt/trunk/lnt/formats/JSONFormat.py
lnt/trunk/lnt/util/ServerUtil.py
lnt/trunk/lnt/util/__init__.py
Modified: lnt/trunk/lnt/formats/JSONFormat.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/formats/JSONFormat.py?rev=307324&r1=307323&r2=307324&view=diff
==============================================================================
--- lnt/trunk/lnt/formats/JSONFormat.py (original)
+++ lnt/trunk/lnt/formats/JSONFormat.py Thu Jul 6 15:06:29 2017
@@ -1,4 +1,4 @@
-from lnt.util import json
+import json
def _matches_format(path_or_file):
if isinstance(path_or_file, str):
Modified: lnt/trunk/lnt/util/ServerUtil.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/ServerUtil.py?rev=307324&r1=307323&r2=307324&view=diff
==============================================================================
--- lnt/trunk/lnt/util/ServerUtil.py (original)
+++ lnt/trunk/lnt/util/ServerUtil.py Thu Jul 6 15:06:29 2017
@@ -7,9 +7,9 @@ import sys
import urllib
import urllib2
import contextlib
+import json
import lnt.server.instance
-from lnt.util import json
from lnt.util import ImportData
# FIXME: I used to maintain this file in such a way that it could be used
Modified: lnt/trunk/lnt/util/__init__.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/util/__init__.py?rev=307324&r1=307323&r2=307324&view=diff
==============================================================================
--- lnt/trunk/lnt/util/__init__.py (original)
+++ lnt/trunk/lnt/util/__init__.py Thu Jul 6 15:06:29 2017
@@ -1,6 +1 @@
__all__ = []
-
-try:
- import json
-except ImportError:
- import simplejson as json
More information about the llvm-commits
mailing list