From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 18 Jul 2011 17:43:21 +0000 (+0200)
Subject: Be lenient about download URLs (Closes #108)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=91e6a3855b4d76cefe7415ea9a1bafd98ad6bece;p=youtube-dl

Be lenient about download URLs (Closes #108)
---

diff --git a/youtube-dl b/youtube-dl
index 762bfc3ef..07904604c 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -62,7 +62,7 @@ simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode
 
 try:
 	import json
-except ImportError: # Python <2.5, use trivialjson (https://github.com/phihag/trivialjson):
+except ImportError: # Python <2.6, use trivialjson (https://github.com/phihag/trivialjson):
 	import re
 	class json(object):
 		@staticmethod
@@ -1241,6 +1241,7 @@ class YoutubeIE(InfoExtractor):
 			html_parser = lxml.etree.HTMLParser(encoding='utf-8')
 			vwebpage_doc = lxml.etree.parse(StringIO.StringIO(video_webpage), html_parser)
 			video_description = u''.join(vwebpage_doc.xpath('id("eow-description")//text()'))
+			# TODO use another parser
 
 		# token
 		video_token = urllib.unquote_plus(video_info['token'][0])
@@ -1248,7 +1249,7 @@ class YoutubeIE(InfoExtractor):
 		# Decide which formats to download
 		req_format = self._downloader.params.get('format', None)
 
-		if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1 and ',' in video_info['fmt_url_map'][0]:
+		if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1:
 			url_map = dict(tuple(pair.split('|')) for pair in video_info['fmt_url_map'][0].split(','))
 			format_limit = self._downloader.params.get('format_limit', None)
 			if format_limit is not None and format_limit in self._available_formats: