From fffcaea176b785c9715a180f6a629708db16536c Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Sun, 10 Feb 2013 16:45:07 -0600 Subject: Add control-M to list of characters to strip out Adds ^M to list of characters to strip out. Fixes LP: #1108820 Change-Id: I070fa566afaafdb932a21b198c669628c56b284b Signed-off-by: Chuck Short --- nova/api/openstack/compute/contrib/console_output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index 953459d38..4f01bbaf4 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -67,7 +67,7 @@ class ConsoleOutputController(wsgi.Controller): raise webob.exc.HTTPNotFound(_('Unable to get console')) # XML output is not correctly escaped, so remove invalid characters - remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F]') + remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F-\x0D]') output = remove_re.sub('', output) return {'output': output} -- cgit