|
|
|
@ -50,11 +50,11 @@ except ImportError: |
|
|
|
|
|
|
|
try: |
|
|
|
import lxml.etree |
|
|
|
except ImportError: # Python < 2.6 |
|
|
|
except ImportError: |
|
|
|
pass # Handled below |
|
|
|
|
|
|
|
std_headers = { |
|
|
|
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20100101 Firefox/4.0b11', |
|
|
|
'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1', |
|
|
|
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7', |
|
|
|
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', |
|
|
|
'Accept-Encoding': 'gzip, deflate', |
|
|
|
@ -1265,7 +1265,7 @@ class YoutubeIE(InfoExtractor): |
|
|
|
url_data = [parse_qs(uds) for uds in url_data_strs] |
|
|
|
url_data = filter(lambda ud: 'itag' in ud and 'url' in ud, url_data) |
|
|
|
url_map = dict((ud['itag'][0], ud['url'][0]) for ud in url_data) |
|
|
|
|
|
|
|
|
|
|
|
format_limit = self._downloader.params.get('format_limit', None) |
|
|
|
if format_limit is not None and format_limit in self._available_formats: |
|
|
|
format_list = self._available_formats[self._available_formats.index(format_limit):] |
|
|
|
@ -2974,7 +2974,7 @@ if __name__ == '__main__': |
|
|
|
# Parse command line |
|
|
|
parser = optparse.OptionParser( |
|
|
|
usage='Usage: %prog [options] url...', |
|
|
|
version='2011.07.09-phihag', |
|
|
|
version='2011.08.04-phihag', |
|
|
|
conflict_handler='resolve', |
|
|
|
) |
|
|
|
|
|
|
|
|
Philipp Hagemeister