← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/console/service.py

  • Committer: Matt Giuca
  • Date: 2010-02-23 07:46:34 UTC
  • Revision ID: matt.giuca@gmail.com-20100223074634-r08p14zoy3u5atoc
https://launchpad.net/bugs/492510
browser.js: Fixed check for whether to use specialhome -- now works if the path ends in a '/'. This fixes Launchpad Bug #492510.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/console/service.py
87
87
 
88
88
        msg = {'cmd':kind, 'text':text}
89
89
        try:
90
 
            json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
91
 
 
92
 
            # Snoop the response from python-console to check that it's valid
93
90
            try:
 
91
                json_response = ivle.chat.chat(host, port, msg, magic,decode=False)
 
92
                # Snoop the response from python-console to check that it's valid
94
93
                response = cjson.decode(json_response)
95
 
            except cjson.DecodeError:
 
94
            except (cjson.DecodeError, ivle.chat.ProtocolError):
96
95
                # Could not decode the reply from the python-console server
97
96
                response = {"terminate":
98
97
                    "Communication to console process lost"}