From dfdb6c60d0e0f1fc24ca7409069db72dd4a6cf1c Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 1 Mar 2024 12:17:11 -0500 Subject: [PATCH] Fix lints. --- src/allmydata/check_results.py | 2 +- src/allmydata/test/cli/test_list.py | 2 +- src/allmydata/test/test_encodingutil.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/allmydata/check_results.py b/src/allmydata/check_results.py index e9ef59bdb..44a4a1db8 100644 --- a/src/allmydata/check_results.py +++ b/src/allmydata/check_results.py @@ -61,7 +61,7 @@ class CheckResults(object): # On Python 2, we can mix bytes and Unicode. On Python 3, we want # unicode. if isinstance(summary, bytes): - summary = unicode(summary, "utf-8") + summary = str(summary, "utf-8") assert isinstance(summary, str) # should be a single string self._summary = summary assert not isinstance(report, str) # should be list of strings diff --git a/src/allmydata/test/cli/test_list.py b/src/allmydata/test/cli/test_list.py index f9ab52c53..55f0952fe 100644 --- a/src/allmydata/test/cli/test_list.py +++ b/src/allmydata/test/cli/test_list.py @@ -9,7 +9,7 @@ from allmydata.immutable import upload from allmydata.interfaces import MDMF_VERSION, SDMF_VERSION from allmydata.mutable.publish import MutableData from ..no_network import GridTestMixin -from allmydata.util.encodingutil import quote_output, get_io_encoding +from allmydata.util.encodingutil import quote_output from .common import CLITestMixin diff --git a/src/allmydata/test/test_encodingutil.py b/src/allmydata/test/test_encodingutil.py index 210d46203..c98ef9e40 100644 --- a/src/allmydata/test/test_encodingutil.py +++ b/src/allmydata/test/test_encodingutil.py @@ -65,7 +65,7 @@ from allmydata.test.common_util import ( from allmydata.util import encodingutil, fileutil from allmydata.util.encodingutil import unicode_to_url, \ unicode_to_output, quote_output, quote_path, quote_local_unicode_path, \ - quote_filepath, unicode_platform, listdir_unicode, FilenameEncodingError, \ + quote_filepath, unicode_platform, listdir_unicode, \ get_filesystem_encoding, to_bytes, from_utf8_or_none, _reload, \ to_filepath, extend_filepath, unicode_from_filepath, unicode_segments_from, \ unicode_to_argv