commit 7b4250286962da0f8dc6731d7f1c8cec9ccb4146
parent f733b8acd67f487a56e56bfb454ff99bc8d1cab0
Author: Nick Mathewson <nickm@torproject.org>
Date: Thu, 20 Feb 2020 10:44:36 -0500
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
Diffstat:
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/changes/bug33374 b/changes/bug33374
@@ -0,0 +1,5 @@
+ o Minor bugfixes (coding best practices checks):
+ - Allow the "practracker" coding best practices checking script to read
+ unicode files, when using Python 2. We made the script use unicode
+ literals in 0.4.3.1-alpha, but didn't change the codec for opening files.
+ Fixes bug 33374; bugfix on 0.4.3.1-alpha.
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
@@ -24,7 +24,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
-import os, sys
+import codecs, os, sys
import metrics
import util
@@ -63,12 +63,8 @@ TOR_TOPDIR = None
#######################################################
-if sys.version_info[0] <= 2:
- def open_file(fname):
- return open(fname, 'r')
-else:
- def open_file(fname):
- return open(fname, 'r', encoding='utf-8')
+def open_file(fname):
+ return codecs.open(fname, 'r', encoding='utf-8')
def consider_file_size(fname, f):
"""Consider the size of 'f' and yield an FileSizeItem for it.
