From 9f37a9594147b71b1ce796219f75fc3a2bb544d3 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Wed, 28 Nov 2012 00:17:12 +0100 Subject: Py2/3 parse_qs compatibility --- youtube_dl/utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'youtube_dl/utils.py') diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 370567705..a27ac77dd 100644 --- 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 -- cgit v1.2.3