← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/cgirequest.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:
ivle/cgirequest.py
241
241
            return sys.stdin.read(len)
242
242
 
243
243
    def handle_unknown_exception(self, exc_type, exc_value, exc_tb):
244
 
        if exc_type is ivle.util.IVLEError:
245
 
            self.headers_out['X-IVLE-Error-Code'] = exc_value.httpcode
246
 
 
247
244
        self.headers_out['X-IVLE-Error-Type'] = exc_type.__name__
248
245
 
249
246
        try: