Merging upstream version 1.14.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

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