Py2/3 parse_qs compatibility

[youtube-dl] / youtube_dl / utils.py

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 370567705c64886c24bdffe51ef12d033c0d796d..a27ac77dd65fe6277f21673d8bc3655d719f4031 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -33,19 +33,23 @@ except ImportError: # Python 2
 
 try:
        import html.entities as compat_html_entities
-except NameError: # Python 2
+except ImportError: # Python 2
        import htmlentitydefs as compat_html_entities
 
 try:
        import html.parser as compat_html_parser
-except NameError: # Python 2
+except ImportError: # Python 2
        import HTMLParser as compat_html_parser
 
 try:
        import http.client as compat_html_client
-except NameError: # Python 2
+except ImportError: # Python 2
        import httplib as compat_html_client
 
+try:
+       from urllib.parse.parse_qs import parse_qs as compat_parse_qs
+except ImportError: # Python 2
+       from urlparse import parse_qs as compat_parse_qs
 
 try:
        compat_str = unicode # Python 2