← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/fileservice_lib/listing.py

  • Committer: William Grant
  • Date: 2010-07-28 04:13:05 UTC
  • mfrom: (1801.1.2 die-cjson-die)
  • Revision ID: grantw@unimelb.edu.au-20100728041305-xwypm3cn1l1mnki1
Port from cjson to (simple)json.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/fileservice_lib/listing.py
105
105
import urlparse
106
106
from cgi import parse_qs
107
107
 
108
 
import cjson
 
108
try:
 
109
    import json
 
110
except ImportError:
 
111
    import simplejson as json
 
112
 
109
113
import pysvn
110
114
 
111
115
import ivle.svn
148
152
 
149
153
    # FIXME: What to do about req.path == ""?
150
154
    # Currently goes to 403 Forbidden.
151
 
    json = None
152
155
    if path is None:
153
156
        req.status = req.HTTP_FORBIDDEN
154
157
        req.headers_out['X-IVLE-Return-Error'] = 'Forbidden'
179
182
        newjson = get_dirlisting(req, svnclient, path, revision)
180
183
        if ("X-IVLE-Action-Error" in req.headers_out):
181
184
            newjson["Error"] = req.headers_out["X-IVLE-Action-Error"]
182
 
        req.write(cjson.encode(newjson))
 
185
        req.write(json.dumps(newjson))
183
186
    elif return_contents:
184
187
        # It's a file. Return the file contents.
185
188
        # First get the mime type of this file
194
197
        # It's a file. Return a "fake directory listing" with just this file.
195
198
        req.content_type = mime_dirlisting
196
199
        req.headers_out['X-IVLE-Return'] = 'File'
197
 
        req.write(cjson.encode(get_dirlisting(req, svnclient, path,
198
 
                                              revision)))
 
200
        req.write(json.dumps(get_dirlisting(req, svnclient, path,
 
201
                                            revision)))
199
202
 
200
203
def _get_revision_or_die(req, svnclient, path):
201
204
    """Looks for a revision specification in req's URL.