aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-09-27 19:56:29 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2012-09-27 19:56:29 +0200
commit34ae0f9d2019c043f86cb31d37ba30fea9c2faf2 (patch)
tree9f24299bc0ea7e6912f546b5cdb526dc8efc71a7
parent74e716bb6401517f8575215d308cd19eedf4e3fe (diff)
parentdf09e5f9e11fdea4df36891f8cbb9d3cc95f56c4 (diff)
Merge branch 'master' of github.com:rg3/youtube-dl
-rw-r--r--youtube_dl/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 5ed453bf7..180a0707d 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -190,6 +190,8 @@ def parseOpts():
general.add_option('--dump-user-agent',
action='store_true', dest='dump_user_agent',
help='display the current browser identification', default=False)
+ general.add_option('--user-agent',
+ action='store', dest='useragent', help='specify a custom user agent')
general.add_option('--list-extractors',
action='store_true', dest='list_extractors',
help='List all supported extractors and the URLs they would handle', default=False)
@@ -370,7 +372,10 @@ def _real_main():
jar.load()
except (IOError, OSError), err:
sys.exit(u'ERROR: unable to open cookie file')
-
+ # Set user agent
+ if opts.useragent is not None:
+ std_headers['User-Agent'] = opts.useragent
+
# Dump user agent
if opts.dump_user_agent:
print std_headers['User-Agent']