From b8ad4f02a2124c9e08570bfb2ab05f2024cb2fb7 Mon Sep 17 00:00:00 2001
From: Finn Petersen <4peterse@googlemail.com>
Date: Tue, 16 Apr 2013 19:26:48 +0200
Subject: [PATCH 1/2] Arguments as parameter to function _real_main so it can
 be used programmatically

---
 youtube_dl/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f46143e01b..b339427e81 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -47,7 +47,7 @@ from .FileDownloader import *
 from .InfoExtractors import gen_extractors
 from .PostProcessor import *
 
-def parseOpts():
+def parseOpts(arguments):
     def _readOptions(filename_bytes):
         try:
             optionf = open(filename_bytes)
@@ -298,8 +298,8 @@ def parseOpts():
         userConfFile = os.path.join(os.path.expanduser('~'), '.config', 'youtube-dl.conf')
     systemConf = _readOptions('/etc/youtube-dl.conf')
     userConf = _readOptions(userConfFile)
-    commandLineConf = sys.argv[1:]
-    argv = systemConf + userConf + commandLineConf
+    commandLineConf = sys.argv[1:] 
+    argv = systemConf + userConf + commandLineConf if not arguments else arguments
     opts, args = parser.parse_args(argv)
 
     if opts.verbose:
@@ -309,8 +309,8 @@ def parseOpts():
 
     return parser, opts, args
 
-def _real_main():
-    parser, opts, args = parseOpts()
+def _real_main(argv=None):
+    parser, opts, args = parseOpts(argv)
 
     # Open appropriate CookieJar
     if opts.cookiefile is None:
@@ -544,9 +544,9 @@ def _real_main():
 
     sys.exit(retcode)
 
-def main():
+def main(argv=None):
     try:
-        _real_main()
+        _real_main(argv)
     except DownloadError:
         sys.exit(1)
     except SameFileError:

From 30f2999962ef411abc7c191e66b4c40ed5b86db5 Mon Sep 17 00:00:00 2001
From: Finn Petersen <4peterse@googlemail.com>
Date: Mon, 22 Apr 2013 10:15:58 +0200
Subject: [PATCH 2/2] Added parenthesis for explicity

---
 youtube_dl/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index b339427e81..87d3f222aa 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -299,7 +299,7 @@ def parseOpts(arguments):
     systemConf = _readOptions('/etc/youtube-dl.conf')
     userConf = _readOptions(userConfFile)
     commandLineConf = sys.argv[1:] 
-    argv = systemConf + userConf + commandLineConf if not arguments else arguments
+    argv = (systemConf + userConf + commandLineConf) if not arguments else arguments
     opts, args = parser.parse_args(argv)
 
     if opts.verbose: