← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to test/test_framework/test_json.py

  • Committer: William Grant
  • Date: 2010-07-20 04:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1826.
  • Revision ID: grantw@unimelb.edu.au-20100720045231-8ia3uk8nao8zdq1i
Replace cjson with json, or simplejson if json is not available (Python <2.6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/test_framework/test_json.py
1
 
import cjson
2
1
import sys
 
2
 
 
3
try:
 
4
    import json
 
5
except ImportError:
 
6
    import simplejson as json
 
7
 
3
8
sys.path.append('../../www/apps/tutorial/test/')
4
9
 
5
10
from parse_tute import *
14
19
    jobj['name'], results = problem_suite.run_tests(pyfile)
15
20
    jobj['cases'] = results
16
21
 
17
 
    print cjson.encode(jobj)
 
22
    print json.dumps(jobj)