Bump version number

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 6b21f8a196b7408592f84769e93c3e92759ebd9e..640ed4bdc801855e71a2fd6809dd65fc0724fb87 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -18,7 +18,12 @@ import sys
 import time
 import urllib
 import urllib2
-import urlparse
+
+# 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
 
 std_headers = {
        'User-Agent': 'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2',
@@ -729,7 +734,7 @@ class YoutubeIE(InfoExtractor):
                        try:
                                self.report_video_info_webpage_download(video_id)
                                video_info_webpage = urllib2.urlopen(request).read()
-                               video_info = urlparse.parse_qs(video_info_webpage)
+                               video_info = parse_qs(video_info_webpage)
                        except (urllib2.URLError, httplib.HTTPException, socket.error), err:
                                self._downloader.trouble(u'ERROR: unable to download video info webpage: %s' % str(err))
                                return
@@ -1085,7 +1090,7 @@ class YoutubeUserIE(InfoExtractor):
 
        _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/user/(.*)'
        _TEMPLATE_URL = 'http://gdata.youtube.com/feeds/api/users/%s'
-       _VIDEO_INDICATOR = r'http://gdata.youtube.com/feeds/api/videos/(.*)'
+       _VIDEO_INDICATOR = r'http://gdata.youtube.com/feeds/api/videos/(.*)' # XXX Fix this.
        _youtube_ie = None
 
        def __init__(self, youtube_ie, downloader=None):
@@ -1098,7 +1103,7 @@ class YoutubeUserIE(InfoExtractor):
 
        def report_download_page(self, username):
                """Report attempt to download user page."""
-               self._downloader.to_stdout(u'[youtube] USR %s: Downloading page ' % (username))
+               self._downloader.to_stdout(u'[youtube] user %s: Downloading page ' % (username))
 
        def _real_initialize(self):
                self._youtube_ie.initialize()
@@ -1127,7 +1132,6 @@ class YoutubeUserIE(InfoExtractor):
                ids_in_page = []
 
                for mobj in re.finditer(self._VIDEO_INDICATOR, page):
-                       print mobj.group(1)
                        if mobj.group(1) not in ids_in_page:
                                ids_in_page.append(mobj.group(1))
                video_ids.extend(ids_in_page)
@@ -1213,7 +1217,7 @@ if __name__ == '__main__':
                # Parse command line
                parser = optparse.OptionParser(
                        usage='Usage: %prog [options] url...',
-                       version='2009.12.26',
+                       version='2010.01.06',
                        conflict_handler='resolve',
                )