From: dirkf <fieldhouse@gmx.net>
Date: Sat, 20 Aug 2022 23:19:19 +0000 (+0100)
Subject: [utils] Ensure RFC3986 encoding result is unicode
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=556862bc911bb54435b7b0b01451789b884b0390;p=youtube-dl

[utils] Ensure RFC3986 encoding result is unicode
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index a5f584ec5..fea38ed32 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -3970,7 +3970,8 @@ def escape_rfc3986(s):
     """Escape non-ASCII characters as suggested by RFC 3986"""
     if sys.version_info < (3, 0) and isinstance(s, compat_str):
         s = s.encode('utf-8')
-    return compat_urllib_parse.quote(s, b"%/;:@&=+$,!~*'()?#[]")
+    # ensure unicode: after quoting, it can always be converted
+    return compat_str(compat_urllib_parse.quote(s, b"%/;:@&=+$,!~*'()?#[]"))
 
 
 def escape_url(url):