← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/filesystem/diff/__init__.py

  • Committer: David Coles
  • Date: 2010-07-28 10:45:53 UTC
  • mfrom: (1829 trunk)
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: coles.david@gmail.com-20100728104553-5z3nxt0l6kyfqfh5
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/filesystem/diff/__init__.py
23
23
import re
24
24
import cgi
25
25
 
26
 
import cjson
 
26
try:
 
27
    import json
 
28
except ImportError:
 
29
    import simplejson as json
 
30
 
27
31
import genshi
28
32
 
29
33
import ivle.interpret
62
66
                            )
63
67
        assert not err
64
68
 
65
 
        response = cjson.decode(out)
 
69
        response = json.loads(out)
66
70
        if 'error' in response:
67
71
            if response['error'] == 'notfound':
68
72
                raise NotFound()