diff options
| author | teor <teor@torproject.org> | 2020-02-19 08:22:01 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-02-19 08:22:01 +1000 |
| commit | 57ff8d4a5323356a8d879caf8226c934f2e82260 (patch) | |
| tree | 0d855e3cd944f9accfb906cff514acb5f5ff0b73 /scripts | |
| parent | a79841fd83b6d800796c04855841170c364ff2a9 (diff) | |
| download | tor-57ff8d4a5323356a8d879caf8226c934f2e82260.tar.gz tor-57ff8d4a5323356a8d879caf8226c934f2e82260.zip | |
practracker: Read unicode files when using Python 2
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.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maint/practracker/practracker.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6149fb79cb..79b13cb056 100755 --- 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. |