debian/control: Update list of supported sites.

[youtubedl] / youtube_dl / compat.py

diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index c75ab131b9955cec1367ec42aa41d8dadde423da..0ee9bc76020377dc811c0d06736eba8082a53dbd 100644 (file)
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -57,6 +57,17 @@ try:
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
 
 except ImportError:  # Python 2
     import cookielib as compat_cookiejar
 

+if sys.version_info[0] == 2:
+    class compat_cookiejar_Cookie(compat_cookiejar.Cookie):
+        def __init__(self, version, name, value, *args, **kwargs):
+            if isinstance(name, compat_str):
+                name = name.encode()
+            if isinstance(value, compat_str):
+                value = value.encode()
+            compat_cookiejar.Cookie.__init__(self, version, name, value, *args, **kwargs)
+else:
+    compat_cookiejar_Cookie = compat_cookiejar.Cookie
+

 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2
 try:
     import http.cookies as compat_cookies
 except ImportError:  # Python 2


@@ -2754,6 +2765,17 @@ else:
         compat_expanduser = os.path.expanduser
 
 
         compat_expanduser = os.path.expanduser
 
 

+if compat_os_name == 'nt' and sys.version_info < (3, 8):
+    # os.path.realpath on Windows does not follow symbolic links
+    # prior to Python 3.8 (see https://bugs.python.org/issue9949)
+    def compat_realpath(path):
+        while os.path.islink(path):
+            path = os.path.abspath(os.readlink(path))
+        return path
+else:
+    compat_realpath = os.path.realpath
+
+

 if sys.version_info < (3, 0):
     def compat_print(s):
         from .utils import preferredencoding
 if sys.version_info < (3, 0):
     def compat_print(s):
         from .utils import preferredencoding


@@ -2976,6 +2998,7 @@ __all__ = [
     'compat_basestring',
     'compat_chr',
     'compat_cookiejar',
     'compat_basestring',
     'compat_chr',
     'compat_cookiejar',

+    'compat_cookiejar_Cookie',

     'compat_cookies',
     'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',
     'compat_cookies',
     'compat_ctypes_WINFUNCTYPE',
     'compat_etree_Element',


@@ -2998,6 +3021,7 @@ __all__ = [
     'compat_os_name',
     'compat_parse_qs',
     'compat_print',
     'compat_os_name',
     'compat_parse_qs',
     'compat_print',

+    'compat_realpath',

     'compat_setenv',
     'compat_shlex_quote',
     'compat_shlex_split',
     'compat_setenv',
     'compat_shlex_quote',
     'compat_shlex_split',