mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-10 14:48:46 +02:00
contrib: Remove confusing and redundant encoding from IO
The encoding arg is confusing, because it is not applied consistently for all IO. Also, it is useless, as the majority of files are ASCII encoded, which are fine to encode and decode with any mode. Moreover, UTF-8 is already required for most scripts to work properly, so setting the encoding twice is redundant. So remove the encoding from most IO. It would be fine to remove from all IO, however I kept it for two files: * contrib/asmap/asmap-tool.py: This specifically looks for utf-8 encoding errors, so it makes sense to sepecify the utf-8 encoding explicitly. * test/functional/test_framework/test_node.py: Reading the debug log in text mode specifically counts the utf-8 characters (not bytes), so it makes sense to specify the utf-8 encoding explicitly.
This commit is contained in:
@@ -428,7 +428,7 @@ def main():
|
||||
# Read config generated by configure.
|
||||
config = configparser.ConfigParser()
|
||||
configfile = os.path.abspath(os.path.dirname(__file__)) + "/../config.ini"
|
||||
config.read_file(open(configfile, encoding="utf8"))
|
||||
config.read_file(open(configfile))
|
||||
|
||||
passon_args.append("--configfile=%s" % configfile)
|
||||
|
||||
@@ -699,7 +699,7 @@ def print_results(test_results, max_len_name, runtime):
|
||||
|
||||
|
||||
def write_results(test_results, filepath, total_runtime):
|
||||
with open(filepath, mode="w", encoding="utf8") as results_file:
|
||||
with open(filepath, mode="w") as results_file:
|
||||
results_writer = csv.writer(results_file)
|
||||
results_writer.writerow(['test', 'status', 'duration(seconds)'])
|
||||
all_passed = True
|
||||
@@ -911,7 +911,7 @@ class RPCCoverage():
|
||||
if not os.path.isfile(coverage_ref_filename):
|
||||
raise RuntimeError("No coverage reference found")
|
||||
|
||||
with open(coverage_ref_filename, 'r', encoding="utf8") as coverage_ref_file:
|
||||
with open(coverage_ref_filename, 'r') as coverage_ref_file:
|
||||
all_cmds.update([line.strip() for line in coverage_ref_file.readlines()])
|
||||
|
||||
for root, _, files in os.walk(self.dir):
|
||||
@@ -920,7 +920,7 @@ class RPCCoverage():
|
||||
coverage_filenames.add(os.path.join(root, filename))
|
||||
|
||||
for filename in coverage_filenames:
|
||||
with open(filename, 'r', encoding="utf8") as coverage_file:
|
||||
with open(filename, 'r') as coverage_file:
|
||||
covered_cmds.update([line.strip() for line in coverage_file.readlines()])
|
||||
|
||||
return all_cmds - covered_cmds
|
||||
|
||||
Reference in New Issue
Block a user