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

Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson
2020-02-20 10:44:36 -05:00
parent f733b8acd6 57ff8d4a53
commit 7b42502869
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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.