diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-11 05:50:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-11 05:50:57 +0000 |
| commit | e76252c0bbc9a3ca9e79d47f170493e8d6d66514 (patch) | |
| tree | 3b922f92cd043abb79e68155e396c1016fd43a19 | |
| parent | a45f8d63ac2e06eba1cc8dc971c7ac7fd87fa104 (diff) | |
| parent | fffcaea176b785c9715a180f6a629708db16536c (diff) | |
| download | nova-e76252c0bbc9a3ca9e79d47f170493e8d6d66514.tar.gz nova-e76252c0bbc9a3ca9e79d47f170493e8d6d66514.tar.xz nova-e76252c0bbc9a3ca9e79d47f170493e8d6d66514.zip | |
Merge "Add control-M to list of characters to strip out"
| -rw-r--r-- | nova/api/openstack/compute/contrib/console_output.py | 2 |
1 files changed, 1 insertions, 1 deletions
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} |