mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-19 17:25:17 +03:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From b1d63d980e8b1a666e312e1c05c9037e2920685b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
|
Date: Fri, 29 Jan 2021 18:10:32 -0500
|
|
Subject: [PATCH] Drop encoding parameter from json.load
|
|
|
|
Apparently this is no longer an accepted keyword for json.load(), as
|
|
of python 3.9.
|
|
|
|
This was uncovered in https://bugs.debian.org/973175 where the
|
|
google-i18n-address tests failed. But i haven't been able to find a
|
|
reference for the change in python upstream. Perhaps the encoding
|
|
parameter never did anything, but 3.9 became more strict about
|
|
unhandled keywords.
|
|
|
|
It looks like python's json module does bytestream encoding
|
|
autodetection anyway so this should be safe to do:
|
|
https://bugs.python.org/issue17909
|
|
---
|
|
tests/test_downloader.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/test_downloader.py b/tests/test_downloader.py
|
|
index f9be4ac..856e739 100644
|
|
--- a/tests/test_downloader.py
|
|
+++ b/tests/test_downloader.py
|
|
@@ -45,7 +45,7 @@ def test_downloader_country(tmpdir, country, file_names, data):
|
|
for file_name in file_names:
|
|
assert data_dir.join(file_name).exists()
|
|
assert json.load(
|
|
- data_dir.join(file_name), encoding='utf-8') == data[file_name]
|
|
+ data_dir.join(file_name)) == data[file_name]
|
|
|
|
|
|
def test_downloader_invalid_country():
|