From a9b1125f7ba209887cac36b3c0900cffe2516fa8 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 Apr 2019 07:49:38 +0100 Subject: [PATCH] Revert "Fix crashing console-log" This reverts commit d272d6f3df2610a62f81e2ca26798ea8a6674b06. This worked around a misconfigured environment by forcing stdout to use UTF-8. This is kind of a hack and it only works in Python 2, breaking Python 3 [1]. The correct solution to this issue and all Python 2 unicode print issues is to correctly configuring LC_ALL to use a UTF-8 locale. [1] https://stackoverflow.com/q/4374455 Change-Id: Iaeec1e74262a35f3de3c81f7013835a6aa6f9029 Closes-Bug: #1823287 --- novaclient/v2/shell.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index a5a5ead2c..f7d59dfaa 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -19,7 +19,6 @@ from __future__ import print_function import argparse -import codecs import collections import datetime import getpass @@ -2750,10 +2749,7 @@ def do_console_log(cs, args): """Get console log output of a server.""" server = _find_server(cs, args.server) data = server.get_console_output(length=args.length) - - if data and data[-1] != '\n': - data += '\n' - codecs.getwriter('utf-8')(sys.stdout).write(data) + print(data) @utils.arg('server', metavar='', help=_('Name or ID of server.'))