From 3e3a829f1b8d2d8788de06f016d873717d9aceff Mon Sep 17 00:00:00 2001 From: Mathieu Dupuy Date: Wed, 20 Dec 2023 16:24:48 +0100 Subject: [PATCH] pyugprade --py38-plus --- iredis/completers.py | 5 ++--- iredis/config.py | 6 +++--- iredis/entry.py | 1 - iredis/markdown.py | 4 ++-- iredis/warning.py | 4 ---- tests/cli_tests/test_config.py | 2 +- tests/cli_tests/test_history.py | 4 ++-- tests/cli_tests/test_pager.py | 4 ++-- tests/conftest.py | 2 +- 9 files changed, 13 insertions(+), 19 deletions(-) diff --git a/iredis/completers.py b/iredis/completers.py index 6f9ecac3..b17d3cc5 100644 --- a/iredis/completers.py +++ b/iredis/completers.py @@ -139,8 +139,7 @@ def get_completions( ) # here we yield bigger timestamp first. - for completion in sorted(completions, key=lambda a: a.text): - yield completion + yield from sorted(completions, key=lambda a: a.text) class IRedisCompleter(Completer): @@ -290,7 +289,7 @@ def _touch_keys(self, items): self.key_completer.touch_words(ensure_str(items)) def __repr__(self) -> str: - return "DynamicCompleter(%r -> %r)" % ( + return "DynamicCompleter({!r} -> {!r})".format( self.get_completer, self.current_completer, ) diff --git a/iredis/config.py b/iredis/config.py index 4041bb65..7a542208 100644 --- a/iredis/config.py +++ b/iredis/config.py @@ -88,13 +88,13 @@ def read_config_file(f): config = ConfigObj(f, interpolation=False, encoding="utf8") except ConfigObjError as e: logger.error( - "Unable to parse line {0} of config file " "'{1}'.".format(e.line_number, f) + "Unable to parse line {} of config file " "'{}'.".format(e.line_number, f) ) logger.error("Using successfully parsed config values.") return e.config - except (IOError, OSError) as e: + except OSError as e: logger.error( - "You don't have permission to read " "config file '{0}'.".format(e.filename) + "You don't have permission to read " "config file '{}'.".format(e.filename) ) return None diff --git a/iredis/entry.py b/iredis/entry.py index 0799a078..b4615bba 100644 --- a/iredis/entry.py +++ b/iredis/entry.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import os import logging import sys diff --git a/iredis/markdown.py b/iredis/markdown.py index 89297ec0..a24b7931 100644 --- a/iredis/markdown.py +++ b/iredis/markdown.py @@ -39,7 +39,7 @@ def list(self, body, ordered, *args, **kwargs): tag = "ul" if ordered: tag = "ol" - return "<%s>%s\n" % (tag, body, tag) + return "<{}>{}\n".format(tag, body, tag) def list_item(self, text, *args): """Rendering list item snippet. Like ``
  • ``.""" @@ -62,5 +62,5 @@ def replace_to_markdown_title(original): def render(text): replaced = replace_to_markdown_title(text) html_text = markdown_render(replaced) - logger.debug("[Document] {} ...".format(html_text)[:20]) + logger.debug(f"[Document] {html_text} ..."[:20]) return to_formatted_text(HTML(html_text)) diff --git a/iredis/warning.py b/iredis/warning.py index bb8231ee..0217a297 100644 --- a/iredis/warning.py +++ b/iredis/warning.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - - import sys import click from .commands import dangerous_commands diff --git a/tests/cli_tests/test_config.py b/tests/cli_tests/test_config.py index 1795c624..eeaba333 100644 --- a/tests/cli_tests/test_config.py +++ b/tests/cli_tests/test_config.py @@ -19,7 +19,7 @@ def test_log_location_config(): log = Path("/tmp/iredis1.log") assert log.exists() - with open(log, "r") as logfile: + with open(log) as logfile: content = logfile.read() assert len(content) > 100 diff --git a/tests/cli_tests/test_history.py b/tests/cli_tests/test_history.py index 09e6c829..acb25d3d 100644 --- a/tests/cli_tests/test_history.py +++ b/tests/cli_tests/test_history.py @@ -10,7 +10,7 @@ def test_history_not_log_auth(cli): cli.sendline("set foo bar") cli.expect("OK") - with open(os.path.expanduser("~/.iredis_history"), "r") as history_file: + with open(os.path.expanduser("~/.iredis_history")) as history_file: content = history_file.read() assert "set foo bar" in content @@ -36,7 +36,7 @@ def test_history_create_and_writing_with_config(): log = Path("/tmp/iredis_history.txt") assert log.exists() - with open(log, "r") as logfile: + with open(log) as logfile: content = logfile.read() assert "set hello world" in content diff --git a/tests/cli_tests/test_pager.py b/tests/cli_tests/test_pager.py index c3f9fb05..e8106a4f 100644 --- a/tests/cli_tests/test_pager.py +++ b/tests/cli_tests/test_pager.py @@ -13,12 +13,12 @@ TEST_PAGER_BOUNDARY = "---boundary---" TEST_PAGER_BOUNDARY_NUMBER = "---88938347271---" -env_pager = "{0} {1} {2}".format( +env_pager = "{} {} {}".format( sys.executable, os.path.join(pathlib.Path(__file__).parent, "wrappager.py"), TEST_PAGER_BOUNDARY, ) -env_pager_numbers = "{0} {1} {2}".format( +env_pager_numbers = "{} {} {}".format( sys.executable, os.path.join(pathlib.Path(__file__).parent, "wrappager.py"), TEST_PAGER_BOUNDARY_NUMBER, diff --git a/tests/conftest.py b/tests/conftest.py index 593e8a88..42840e33 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -53,7 +53,7 @@ def judge_command_func(input_text, expect): return variables = m.variables() - print("Found variables: {}".format(variables)) + print(f"Found variables: {variables}") for expect_token, expect_value in expect.items(): all_variables = variables.getall(expect_token) if len(all_variables) > 1: