Skip to content

Commit b6d8bad

Browse files
committed
Fixed a Py2/3 issue in the pyflakes management command, and tweaked the verbose output format.
- Legacy-Id: 17372
1 parent a33f66b commit b6d8bad

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

ietf/utils/management/commands/pyflakes.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright The IETF Trust 2014-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2014-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

5-
from __future__ import absolute_import
5+
from __future__ import absolute_import, unicode_literals
66

77
import ast
88
import os
@@ -77,8 +77,6 @@ def check(codeString, filename, verbosity=1):
7777
else:
7878
sys.stderr.write('.')
7979
sys.stderr.flush()
80-
if verbosity > 1:
81-
sys.stderr.write(" %s\n" % filename)
8280
return messages
8381

8482

@@ -88,8 +86,11 @@ def checkPath(filename, verbosity):
8886
8987
@return: the number of warnings printed
9088
"""
89+
if verbosity > 1:
90+
sys.stderr.write("\n %-78s " % filename)
91+
sys.stderr.flush()
9192
try:
92-
return check(open(filename).read() + '\n', filename, verbosity)
93+
return check(open(filename, encoding='utf-8').read() + '\n', filename, verbosity)
9394
except IOError as msg:
9495
return ["%s: %s" % (filename, msg.args[1])]
9596
except TypeError:

0 commit comments

Comments
 (0)