From b6d8bade44781de3b30d1c3aa0f269e1b3127527 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 2 Mar 2020 12:31:02 +0000 Subject: [PATCH] Fixed a Py2/3 issue in the pyflakes management command, and tweaked the verbose output format. - Legacy-Id: 17372 --- ietf/utils/management/commands/pyflakes.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py index 0423afff4..c4164b681 100644 --- a/ietf/utils/management/commands/pyflakes.py +++ b/ietf/utils/management/commands/pyflakes.py @@ -1,8 +1,8 @@ -# Copyright The IETF Trust 2014-2019, All Rights Reserved +# Copyright The IETF Trust 2014-2020, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import absolute_import +from __future__ import absolute_import, unicode_literals import ast import os @@ -77,8 +77,6 @@ def check(codeString, filename, verbosity=1): else: sys.stderr.write('.') sys.stderr.flush() - if verbosity > 1: - sys.stderr.write(" %s\n" % filename) return messages @@ -88,8 +86,11 @@ def checkPath(filename, verbosity): @return: the number of warnings printed """ + if verbosity > 1: + sys.stderr.write("\n %-78s " % filename) + sys.stderr.flush() try: - return check(open(filename).read() + '\n', filename, verbosity) + return check(open(filename, encoding='utf-8').read() + '\n', filename, verbosity) except IOError as msg: return ["%s: %s" % (filename, msg.args[1])] except TypeError: