← 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 04:38:33 UTC
  • Revision ID: matt.giuca@gmail.com-20100223043833-f73naxuzoz6ux7rm
https://launchpad.net/bugs/524176
browser.js: Fixed generation of links in file browser to Serve, Download and Share-this-file links containing special URI characters. Now properly URL-encoded. Added util.js app_url and public_app_url, replacing calls to app_path and public_app_path. Fixes Launchpad bug #524176.

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
90
93
            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
93
94
                response = cjson.decode(json_response)
94
 
            except (cjson.DecodeError, ivle.chat.ProtocolError):
 
95
            except cjson.DecodeError:
95
96
                # Could not decode the reply from the python-console server
96
97
                response = {"terminate":
97
98
                    "Communication to console process lost"}