← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/serveservice

  • Committer: William Grant
  • Date: 2009-03-05 08:00:42 UTC
  • Revision ID: grantw@unimelb.edu.au-20090305080042-d347eerb5enjtg72
Remove an extra argument to console_response() in console_reset(). Fixes
Google Code issue 121, where the console reset button reset the console
but produced an error dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/serveservice
113
113
           determine_file_type(filename) in ivle.conf.app.server.interpreters:
114
114
            throw_error('is-executable', {'path': filename})
115
115
 
116
 
        if not download and (
117
 
            (ivle.conf.app.server.blacklist_served_filetypes and \
 
116
        if (ivle.conf.app.server.blacklist_served_filetypes and \
118
117
                determine_file_type(filename) in \
119
118
                ivle.conf.app.server.served_filetypes_blacklist) or \
120
119
            (ivle.conf.app.server.served_filetypes_whitelist and \
121
120
                determine_file_type(filename) not in \
122
 
                ivle.conf.app.server.served_filetypes_whitelist)):
 
121
                ivle.conf.app.server.served_filetypes_whitelist):
123
122
            throw_error('forbidden')
124
123
 
125
124
if zipmode:
139
138
 
140
139
    print cjson.encode({'type': zip_mimetype,
141
140
                        'name': zipfilename})
142
 
 
143
 
    stream = zipfile
144
 
    stream.seek(0)
 
141
    print zipfile.getvalue()
145
142
else:
146
 
 
147
143
    print cjson.encode({'type': determine_file_type(filename),
148
144
                        'name': os.path.basename(filename)})
149
 
    stream = open(filename)
150
 
    
151
 
next = stream.read(1024)
152
 
while next:
153
 
    sys.stdout.write(next)
154
 
    next = stream.read(1024)
 
145
    print open(filename).read()