← 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-18 00:12:26 UTC
  • mfrom: (1164 trunk)
  • mto: This revision was merged to the branch mainline in revision 1290.
  • Revision ID: grantw@unimelb.edu.au-20090318001226-fm6rh01lfezetk3x
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/serveservice
139
139
 
140
140
    print cjson.encode({'type': zip_mimetype,
141
141
                        'name': zipfilename})
142
 
    print zipfile.getvalue()
 
142
 
 
143
    stream = zipfile
 
144
    stream.seek(0)
143
145
else:
 
146
 
144
147
    print cjson.encode({'type': determine_file_type(filename),
145
148
                        'name': os.path.basename(filename)})
146
 
    print open(filename).read()
 
149
    stream = open(filename)
 
150
    
 
151
next = stream.read(1024)
 
152
while next:
 
153
    sys.stdout.write(next)
 
154
    next = stream.read(1024)