← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/python-console

  • Committer: William Grant
  • Date: 2009-12-10 04:35:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1398.
  • Revision ID: grantw@unimelb.edu.au-20091210043539-lvfr4o480wrhbhs5
python-console will now substitute a FakeObject when it sees a PicklingError, not just a TypeError.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/python-console
399
399
    for o in object:
400
400
        try:
401
401
            flat[o] = cPickle.dumps(object[o], PICKLEVERSION)
402
 
        except TypeError:
 
402
        except (TypeError, cPickle.PicklingError):
403
403
            try:
404
404
                o_type = type(object[o]).__name__
405
405
                o_name = object[o].__name__