[llvm-commits] [zorg] r110923 - in /zorg/trunk/lnt/lnt: formats/JSONFormat.py util/__init__.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug 12 11:03:46 2010
New Revision: 110923

URL: http://llvm.org/viewvc/llvm-project?rev=110923&view=rev
Log:
LNT: Make json module more easily accessable.

Modified:
    zorg/trunk/lnt/lnt/formats/JSONFormat.py
    zorg/trunk/lnt/lnt/util/__init__.py

Modified: zorg/trunk/lnt/lnt/formats/JSONFormat.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/formats/JSONFormat.py?rev=110923&r1=110922&r2=110923&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/formats/JSONFormat.py (original)
+++ zorg/trunk/lnt/lnt/formats/JSONFormat.py Thu Aug 12 11:03:46 2010
@@ -1,7 +1,4 @@
-try:
-    import json
-except ImportError:
-    import simplejson as json
+from lnt.util import json
 
 def _matches_format(path_or_file):
     if isinstance(path_or_file, str):

Modified: zorg/trunk/lnt/lnt/util/__init__.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/__init__.py?rev=110923&r1=110922&r2=110923&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/__init__.py (original)
+++ zorg/trunk/lnt/lnt/util/__init__.py Thu Aug 12 11:03:46 2010
@@ -1 +1,6 @@
 __all__ = []
+
+try:
+    import json
+except ImportError:
+    import simplejson as json