← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/python-console

  • Committer: Matt Giuca
  • Date: 2009-05-12 15:08:45 UTC
  • mto: This revision was merged to the branch mainline in revision 1247.
  • Revision ID: matt.giuca@gmail.com-20090512150845-fg480l1qh7le0ypz
ivle-fetchsubmissions: In a stunningly awful hack, detects pre-Python2.6 and
    changes make_zip to behave correctly for the awful restriction in zipfile
    that you can't add directories.
    (Stops trying to add directories, and hacks in the footer writing if there
    is an empty file).

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, cPickle.PicklingError):
 
402
        except TypeError:
403
403
            try:
404
404
                o_type = type(object[o]).__name__
405
405
                o_name = object[o].__name__