Merge branch 'master' into add-python-3.12-support

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.14.0
+current_version = 1.14.1
 commit = True
 tag = True
 

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## UPCOMING
 
+### 1.14.1
+
+- Bugfix: fix argument parsing, `"foo\nbar"` will be parsed to `foo` and `\` 
+  and `n` and `bar`, the `\` and `n` should be one character `\n` instead.
+
 ## 1.14
 
 - Dependency: upgrade redis-py to 5 (thanks to [chayim])

iredis/__init__.py

@@ -1 +1 @@
-__version__ = "1.14.0"
+__version__ = "1.14.1"

iredis/client.py

@@ -1,6 +1,7 @@
 """
 IRedis client.
 """
+
 import re
 import os
 import sys

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,
         )

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
 

iredis/entry.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import logging
 import sys

iredis/markdown.py

@@ -39,7 +39,7 @@ def list(self, body, ordered, *args, **kwargs):
         tag = "ul"
         if ordered:
             tag = "ol"
-        return "<%s>%s</%s>\n" % (tag, body, tag)
+        return "<{}>{}</{}>\n".format(tag, body, tag)
 
     def list_item(self, text, *args):
         """Rendering list item snippet. Like ``<li>``."""
@@ -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))

iredis/renders.py

@@ -4,6 +4,7 @@
 
 func(redis-response) -> formatted result(str)
 """
+
 import logging
 import time
 from packaging.version import parse as version_parse

iredis/utils.py

@@ -39,10 +39,11 @@ def literal_bytes(b):
     return b
 
 
-def _valid_token(words):
-    token = "".join(words).strip()
-    if token:
-        yield token
+def nappend(word, c, pre_back_slash):
+    if pre_back_slash and c == "n":  # \n
+        word[-1] = "\n"
+    else:
+        word.append(c)
 
 
 def strip_quote_args(s):
@@ -69,7 +70,7 @@ def strip_quote_args(s):
                     # previous char is \ , merge with current "
                     word[-1] = char
             else:
-                word.append(char)
+                nappend(word, char, pre_back_slash)
         # not in quote
         else:
             # separator
@@ -81,7 +82,7 @@ def strip_quote_args(s):
             elif char in ["'", '"']:
                 in_quote = char
             else:
-                word.append(char)
+                nappend(word, char, pre_back_slash)
         if char == "\\" and not pre_back_slash:
             pre_back_slash = True
         else:

iredis/warning.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-
 import sys
 import click
 from .commands import dangerous_commands

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iredis"
-version = "1.14.0"
+version = "1.14.1"
 description = "Terminal client for Redis with auto-completion and syntax highlighting."
 authors = ["laixintao <laixintao1995@163.com>"]
 readme = 'README.md'

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

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

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,

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:

tests/unittests/test_entry.py

@@ -174,6 +174,19 @@ def test_command_shell_options_higher_priority():
                 verify_ssl=None,
             ),
         ),
+        (
+            "redis://username:pass@word@localhost:12345/2",
+            DSN(
+                scheme="redis",
+                host="localhost",
+                port=12345,
+                path=None,
+                db=2,
+                username="username",
+                password="pass@word",
+                verify_ssl=None,
+            ),
+        ),
         (
             "redis://username@localhost:12345",
             DSN(

tests/unittests/test_utils.py

@@ -55,6 +55,7 @@ def test_timer():
         (r'""', [""]),  # set foo "" is a legal command
         (r"\\", ["\\\\"]),  # backslash are legal
         ("\\hello\\", ["\\hello\\"]),  # backslash are legal
+        ('foo "bar\\n1"', ["foo", "bar\n1"]),
     ],
 )
 def test_stripe_quote_escape_in_quote(test_input, expected):