← Back to branch summary

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

« back to all changes in this revision

Viewing changes to setup/util.py

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup/util.py
256
256
# Mime types which will automatically be placed in the list by InstallList.
257
257
installlist_mimetypes = ['text/x-python', 'text/html',
258
258
    'application/x-javascript', 'application/javascript',
259
 
    'text/css', 'image/png', 'image/gif', 'application/xml', 'text/plain']
 
259
    'text/css', 'image/png', 'image/gif', 'application/xml', 'text/plain',
 
260
    'text/x-sh']
260
261
# Filenames which will automatically be placed in the list by InstallList.
261
262
whitelist_filenames = ['ivle-spec.conf']
262
263
 
310
311
    ]
311
312
 
312
313
    list_user_binaries = [
 
314
        "bin/ivle-addexercise",
 
315
        "bin/ivle-adduser",
 
316
        "bin/ivle-buildjail",
 
317
        "bin/ivle-cloneworksheets",
 
318
        "bin/ivle-config",
 
319
        "bin/ivle-createdatadirs",
313
320
        "bin/ivle-enrol",
314
321
        "bin/ivle-enrolallusers",
 
322
        "bin/ivle-fetchsubmissions",
315
323
        "bin/ivle-listusers",
316
 
        "bin/ivle-makeuser",
317
 
        "bin/ivle-marks",
 
324
        "bin/ivle-loadsampledata",
318
325
        "bin/ivle-mountallusers",
 
326
        "bin/ivle-refreshfilesystem",
319
327
        "bin/ivle-remakeuser",
320
328
        "bin/ivle-showenrolment",
321
 
        "bin/ivle-config",
322
 
        "bin/ivle-createdatadirs",
323
 
        "bin/ivle-buildjail",
324
 
        "bin/ivle-addexercise",
325
 
        "bin/ivle-cloneworksheets",
326
329
    ]