← 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-02-24 02:02:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1119.
  • Revision ID: matt.giuca@gmail.com-20090224020203-aqdcjnsj6y7wl32o
Added a new look to the IVLE header bar. Mmmm... Web 2.0.
Added top-level directory image-source, containing SVG and script files for
    generating the images.
ivle/webapp/coremedia/images: Added 'chrome' directory containing the rendered
    images.
Modified ivle/webapp/base/ivle-headings.html and
    ivle/webapp/coremedia/ivle.css to support the new images.
    Note that the H1 and H2 at the top of the page are no longer displayed
    (and their custom styles have been removed). There is a heading image
    instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/python-console
208
208
 
209
209
        # Try to execute the buffer
210
210
        try:
211
 
            # A single trailing newline simply indicates that the line is
212
 
            # finished. Two trailing newlines indicate the end of a block.
213
 
            # Unfortunately, codeop.CommandCompiler causes even one to
214
 
            # terminate a block.
215
 
            # Thus we need to remove a trailing newline from the command,
216
 
            # unless there are *two* trailing newlines, or multi-line indented
217
 
            # blocks are impossible. See Google Code issue 105.
218
 
            cmd_text = self.curr_cmd
219
 
            if cmd_text.endswith('\n') and not cmd_text.endswith('\n\n'):
220
 
                cmd_text = cmd_text[:-1]
221
 
            cmd = self.cc(cmd_text, '<web session>')
 
211
            cmd = self.cc(self.curr_cmd, '<web session>')
222
212
            if cmd is None:
223
213
                # The command was incomplete, so send back a None, so the              
224
214
                # client can print a '...'
399
389
    for o in object:
400
390
        try:
401
391
            flat[o] = cPickle.dumps(object[o], PICKLEVERSION)
402
 
        except (TypeError, cPickle.PicklingError):
 
392
        except TypeError:
403
393
            try:
404
394
                o_type = type(object[o]).__name__
405
395
                o_name = object[o].__name__