Prepare for release

[youtubedl] / youtube_dl / compat.py

diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index 7189020192601c289f47eafbda40feefd14cde6c..2a62248ef7bc6b9da459fea1e7a7e77a65e9ed95 100644 (file)
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -6,6 +6,7 @@ import collections
 import email
 import getpass
 import io
 import email
 import getpass
 import io

+import itertools

 import optparse
 import os
 import re
 import optparse
 import os
 import re


@@ -15,7 +16,6 @@ import socket
 import struct
 import subprocess
 import sys
 import struct
 import subprocess
 import sys

-import itertools

 import xml.etree.ElementTree
 
 
 import xml.etree.ElementTree
 
 


@@ -2322,6 +2322,19 @@ try:
 except ImportError:  # Python 2
     from HTMLParser import HTMLParser as compat_HTMLParser
 
 except ImportError:  # Python 2
     from HTMLParser import HTMLParser as compat_HTMLParser
 

+try:  # Python 2
+    from HTMLParser import HTMLParseError as compat_HTMLParseError
+except ImportError:  # Python <3.4
+    try:
+        from html.parser import HTMLParseError as compat_HTMLParseError
+    except ImportError:  # Python >3.4
+
+        # HTMLParseError has been deprecated in Python 3.3 and removed in
+        # Python 3.5. Introducing dummy exception for Python >3.5 for compatible
+        # and uniform cross-version exceptiong handling
+        class compat_HTMLParseError(Exception):
+            pass
+

 try:
     from subprocess import DEVNULL
     compat_subprocess_get_DEVNULL = lambda: DEVNULL
 try:
     from subprocess import DEVNULL
     compat_subprocess_get_DEVNULL = lambda: DEVNULL


@@ -2604,14 +2617,22 @@ except ImportError:  # Python 2
                 parsed_result[name] = [value]
         return parsed_result
 
                 parsed_result[name] = [value]
         return parsed_result
 

-try:
-    from shlex import quote as compat_shlex_quote
-except ImportError:  # Python < 3.3
+
+compat_os_name = os._name if os.name == 'java' else os.name
+
+
+if compat_os_name == 'nt':

     def compat_shlex_quote(s):
     def compat_shlex_quote(s):

-        if re.match(r'^[-_\w./]+$', s):
-            return s
-        else:
-            return "'" + s.replace("'", "'\"'\"'") + "'"
+        return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
+else:
+    try:
+        from shlex import quote as compat_shlex_quote
+    except ImportError:  # Python < 3.3
+        def compat_shlex_quote(s):
+            if re.match(r'^[-_\w./]+$', s):
+                return s
+            else:
+                return "'" + s.replace("'", "'\"'\"'") + "'"

 
 
 try:
 
 
 try:


@@ -2636,9 +2657,6 @@ def compat_ord(c):
         return ord(c)
 
 
         return ord(c)
 
 

-compat_os_name = os._name if os.name == 'java' else os.name
-
-

 if sys.version_info >= (3, 0):
     compat_getenv = os.getenv
     compat_expanduser = os.path.expanduser
 if sys.version_info >= (3, 0):
     compat_getenv = os.getenv
     compat_expanduser = os.path.expanduser


@@ -2692,7 +2710,7 @@ else:
                 userhome = pwent.pw_dir
             userhome = userhome.rstrip('/')
             return (userhome + path[i:]) or '/'
                 userhome = pwent.pw_dir
             userhome = userhome.rstrip('/')
             return (userhome + path[i:]) or '/'

-    elif compat_os_name == 'nt' or compat_os_name == 'ce':
+    elif compat_os_name in ('nt', 'ce'):

         def compat_expanduser(path):
             """Expand ~ and ~user constructs.
 
         def compat_expanduser(path):
             """Expand ~ and ~user constructs.
 


@@ -2760,6 +2778,12 @@ else:
     compat_kwargs = lambda kwargs: kwargs
 
 
     compat_kwargs = lambda kwargs: kwargs
 
 

+try:
+    compat_numeric_types = (int, float, long, complex)
+except NameError:  # Python 3
+    compat_numeric_types = (int, float, complex)
+
+

 if sys.version_info < (2, 7):
     def compat_socket_create_connection(address, timeout, source_address=None):
         host, port = address
 if sys.version_info < (2, 7):
     def compat_socket_create_connection(address, timeout, source_address=None):
         host, port = address


@@ -2874,8 +2898,16 @@ else:
     compat_struct_pack = struct.pack
     compat_struct_unpack = struct.unpack
 
     compat_struct_pack = struct.pack
     compat_struct_unpack = struct.unpack
 

+try:
+    from future_builtins import zip as compat_zip
+except ImportError:  # not 2.6+ or is 3.x
+    try:
+        from itertools import izip as compat_zip  # < 2.5 or 3.x
+    except ImportError:
+        compat_zip = zip

 
 __all__ = [
 
 __all__ = [

+    'compat_HTMLParseError',

     'compat_HTMLParser',
     'compat_HTTPError',
     'compat_basestring',
     'compat_HTMLParser',
     'compat_HTTPError',
     'compat_basestring',


@@ -2895,6 +2927,7 @@ __all__ = [
     'compat_input',
     'compat_itertools_count',
     'compat_kwargs',
     'compat_input',
     'compat_itertools_count',
     'compat_kwargs',

+    'compat_numeric_types',

     'compat_ord',
     'compat_os_name',
     'compat_parse_qs',
     'compat_ord',
     'compat_os_name',
     'compat_parse_qs',


@@ -2922,5 +2955,6 @@ __all__ = [
     'compat_urlretrieve',
     'compat_xml_parse_error',
     'compat_xpath',
     'compat_urlretrieve',
     'compat_xml_parse_error',
     'compat_xpath',

+    'compat_zip',

     'workaround_optparse_bug9161',
 ]
     'workaround_optparse_bug9161',
 ]