Imported Upstream version 2014.12.01

[youtubedl] / youtube_dl / compat.py

diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
index 9d33a8ec5fbd80a75a5d382e8621f6dc616c7aa0..27596687d0d2c354990e6112027e054865c1c79c 100644 (file)
--- a/youtube_dl/compat.py
+++ b/youtube_dl/compat.py
@@ -3,53 +3,54 @@ from __future__ import unicode_literals
 import getpass
 import optparse
 import os
 import getpass
 import optparse
 import os

+import re

 import subprocess
 import sys
 
 
 try:
     import urllib.request as compat_urllib_request
 import subprocess
 import sys
 
 
 try:
     import urllib.request as compat_urllib_request

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import urllib2 as compat_urllib_request
 
 try:
     import urllib.error as compat_urllib_error
     import urllib2 as compat_urllib_request
 
 try:
     import urllib.error as compat_urllib_error

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import urllib2 as compat_urllib_error
 
 try:
     import urllib.parse as compat_urllib_parse
     import urllib2 as compat_urllib_error
 
 try:
     import urllib.parse as compat_urllib_parse

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import urllib as compat_urllib_parse
 
 try:
     from urllib.parse import urlparse as compat_urllib_parse_urlparse
     import urllib as compat_urllib_parse
 
 try:
     from urllib.parse import urlparse as compat_urllib_parse_urlparse

-except ImportError: # Python 2
+except ImportError:  # Python 2

     from urlparse import urlparse as compat_urllib_parse_urlparse
 
 try:
     import urllib.parse as compat_urlparse
     from urlparse import urlparse as compat_urllib_parse_urlparse
 
 try:
     import urllib.parse as compat_urlparse

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import urlparse as compat_urlparse
 
 try:
     import http.cookiejar as compat_cookiejar
     import urlparse as compat_urlparse
 
 try:
     import http.cookiejar as compat_cookiejar

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import cookielib as compat_cookiejar
 
 try:
     import html.entities as compat_html_entities
     import cookielib as compat_cookiejar
 
 try:
     import html.entities as compat_html_entities

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import htmlentitydefs as compat_html_entities
 
 try:
     import html.parser as compat_html_parser
     import htmlentitydefs as compat_html_entities
 
 try:
     import html.parser as compat_html_parser

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import HTMLParser as compat_html_parser
 
 try:
     import http.client as compat_http_client
     import HTMLParser as compat_html_parser
 
 try:
     import http.client as compat_http_client

-except ImportError: # Python 2
+except ImportError:  # Python 2

     import httplib as compat_http_client
 
 try:
     import httplib as compat_http_client
 
 try:


@@ -110,12 +111,12 @@ except ImportError:
 
 try:
     from urllib.parse import parse_qs as compat_parse_qs
 
 try:
     from urllib.parse import parse_qs as compat_parse_qs

-except ImportError: # Python 2
+except ImportError:  # Python 2

     # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
     # Python 2's version is apparently totally broken
 
     def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
     # HACK: The following is the correct parse_qs implementation from cpython 3's stdlib.
     # Python 2's version is apparently totally broken
 
     def _parse_qsl(qs, keep_blank_values=False, strict_parsing=False,

-                encoding='utf-8', errors='replace'):
+                   encoding='utf-8', errors='replace'):

         qs, _coerce_result = qs, unicode
         pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
         r = []
         qs, _coerce_result = qs, unicode
         pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
         r = []


@@ -144,10 +145,10 @@ except ImportError: # Python 2
         return r
 
     def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,
         return r
 
     def compat_parse_qs(qs, keep_blank_values=False, strict_parsing=False,

-                encoding='utf-8', errors='replace'):
+                        encoding='utf-8', errors='replace'):

         parsed_result = {}
         pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,
         parsed_result = {}
         pairs = _parse_qsl(qs, keep_blank_values, strict_parsing,

-                        encoding=encoding, errors=errors)
+                           encoding=encoding, errors=errors)

         for name, value in pairs:
             if name in parsed_result:
                 parsed_result[name].append(value)
         for name, value in pairs:
             if name in parsed_result:
                 parsed_result[name].append(value)


@@ -156,12 +157,12 @@ except ImportError: # Python 2
         return parsed_result
 
 try:
         return parsed_result
 
 try:

-    compat_str = unicode # Python 2
+    compat_str = unicode  # Python 2

 except NameError:
     compat_str = str
 
 try:
 except NameError:
     compat_str = str
 
 try:

-    compat_chr = unichr # Python 2
+    compat_chr = unichr  # Python 2

 except NameError:
     compat_chr = chr
 
 except NameError:
     compat_chr = chr
 


@@ -174,12 +175,17 @@ try:
     from shlex import quote as shlex_quote
 except ImportError:  # Python < 3.3
     def shlex_quote(s):
     from shlex import quote as shlex_quote
 except ImportError:  # Python < 3.3
     def shlex_quote(s):

-        return "'" + s.replace("'", "'\"'\"'") + "'"
+        if re.match(r'^[-_\w./]+$', s):
+            return s
+        else:
+            return "'" + s.replace("'", "'\"'\"'") + "'"

 
 
 def compat_ord(c):
 
 
 def compat_ord(c):

-    if type(c) is int: return c
-    else: return ord(c)
+    if type(c) is int:
+        return c
+    else:
+        return ord(c)

 
 
 if sys.version_info >= (3, 0):
 
 
 if sys.version_info >= (3, 0):


@@ -250,7 +256,7 @@ else:
                     drive = ''
                 userhome = os.path.join(drive, compat_getenv('HOMEPATH'))
 
                     drive = ''
                 userhome = os.path.join(drive, compat_getenv('HOMEPATH'))
 

-            if i != 1: #~user
+            if i != 1:  # ~user

                 userhome = os.path.join(os.path.dirname(userhome), path[1:i])
 
             return userhome + path[i:]
                 userhome = os.path.join(os.path.dirname(userhome), path[1:i])
 
             return userhome + path[i:]


@@ -264,7 +270,7 @@ if sys.version_info < (3, 0):
         print(s.encode(preferredencoding(), 'xmlcharrefreplace'))
 else:
     def compat_print(s):
         print(s.encode(preferredencoding(), 'xmlcharrefreplace'))
 else:
     def compat_print(s):

-        assert type(s) == type(u'')
+        assert isinstance(s, compat_str)

         print(s)
 
 
         print(s)