dropped the support for Python 2.5

[youtube-dl] / youtube_dl / InfoExtractors.py

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index d77154dcb4902422f9297c6b0d0fbf90168f5975..256d106b10409c6fbba199c038b4651bc0e2d36e 100644 (file)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -12,23 +12,14 @@ import time
 import urllib
 import urllib2
 import email.utils
+import xml.etree.ElementTree
+from urlparse import parse_qs
 
 try:
        import cStringIO as StringIO
 except ImportError:
        import StringIO
 
-# parse_qs was moved from the cgi module to the urlparse module recently.
-try:
-       from urlparse import parse_qs
-except ImportError:
-       from cgi import parse_qs
-
-try:
-       import xml.etree.ElementTree
-except ImportError: # Python<2.5: Not officially supported, but let it slip
-       warnings.warn('xml.etree.ElementTree support is missing. Consider upgrading to Python >= 2.5 if you get related errors.')
-
 from utils import *
 
 
@@ -359,8 +350,8 @@ class YoutubeIE(InfoExtractor):
                                        pass
 
                # description
-               video_description = get_element_by_id("eow-description", video_webpage)
-               if video_description: video_description = clean_html(video_description.decode('utf8'))
+               video_description = get_element_by_id("eow-description", video_webpage.decode('utf8'))
+               if video_description: video_description = clean_html(video_description)
                else: video_description = ''
                        
                # closed captions
@@ -1055,8 +1046,8 @@ class VimeoIE(InfoExtractor):
                video_thumbnail = config["video"]["thumbnail"]
 
                # Extract video description
-               video_description = get_element_by_id("description", webpage)
-               if video_description: video_description = clean_html(video_description.decode('utf8'))
+               video_description = get_element_by_id("description", webpage.decode('utf8'))
+               if video_description: video_description = clean_html(video_description)
                else: video_description = ''
 
                # Extract upload date