[llvm-commits] [zorg] r99905 - in /zorg/trunk/lnt/lnt: formats/JSONFormat.py testing/__init__.py viewer/zview/zviewui.ptl

[Daniel Dunbar]

Author: ddunbar
Date: Tue Mar 30 13:25:30 2010
New Revision: 99905

URL: http://llvm.org/viewvc/llvm-project?rev=99905&view=rev
Log:
LNT: Support use with simplejson, for 2.5 compatibility.

Modified:
    zorg/trunk/lnt/lnt/formats/JSONFormat.py
    zorg/trunk/lnt/lnt/testing/__init__.py
    zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl

Modified: zorg/trunk/lnt/lnt/formats/JSONFormat.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/formats/JSONFormat.py?rev=99905&r1=99904&r2=99905&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/formats/JSONFormat.py (original)
+++ zorg/trunk/lnt/lnt/formats/JSONFormat.py Tue Mar 30 13:25:30 2010
@@ -1,4 +1,7 @@
-import json
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 def _matches_format(path_or_file):
     if isinstance(path_or_file, str):

Modified: zorg/trunk/lnt/lnt/testing/__init__.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/testing/__init__.py?rev=99905&r1=99904&r2=99905&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/testing/__init__.py (original)
+++ zorg/trunk/lnt/lnt/testing/__init__.py Tue Mar 30 13:25:30 2010
@@ -8,7 +8,11 @@
 
 import time
 import datetime
-import json
+
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 def normalize_time(t):
     if isinstance(t,float):

Modified: zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl?rev=99905&r1=99904&r2=99905&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl (original)
+++ zorg/trunk/lnt/lnt/viewer/zview/zviewui.ptl Tue Mar 30 13:25:30 2010
@@ -12,7 +12,10 @@
 
 from sqlalchemy import func
 
-import json
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 class ZViewUI(Directory):
     _q_exports = ["", "get_machines", "get_tests", "get_test_data",