torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

practracker: Read unicode files when using Python 2

Browse Source 
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.
This commit is contained in:
teor
2020-02-19 08:22:01 +10:00
parent a79841fd83
commit 57ff8d4a53
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug33374
+5
View File
@@ -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.
scripts/maint/practracker/practracker.py
+3 -7
View File
@@ -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.