[Collab-qa-commits] r1823 - udd/udd

[Andreas Tille]

Author: tille
Date: 2010-10-15 07:29:12 +0000 (Fri, 15 Oct 2010)
New Revision: 1823

Modified:
   udd/udd/screenshot_gatherer.py
Log:
Make sure screenshots gatherer will also work with JSON implementations available in Squeeze


Modified: udd/udd/screenshot_gatherer.py
===================================================================
--- udd/udd/screenshot_gatherer.py	2010-10-12 09:11:00 UTC (rev 1822)
+++ udd/udd/screenshot_gatherer.py	2010-10-15 07:29:12 UTC (rev 1823)
@@ -7,6 +7,7 @@
 from aux import quote
 from gatherer import gatherer
 import json
+# import simplejson as json
 from sys import stderr, exit
 
 from psycopg2 import IntegrityError, InternalError
@@ -44,7 +45,8 @@
 
     screenshot_file = my_config['screenshots_json']
     fp = open(screenshot_file, 'r')
-    result = json.read(fp.read())
+    # result = json.read(fp.read())
+    result = json.load(fp)
     fp.close()
 
     for res in result['screenshots']: