diff options
| author | Finn Petersen <4peterse@googlemail.com> | 2013-04-16 19:26:48 +0200 | 
|---|---|---|
| committer | Finn Petersen <4peterse@googlemail.com> | 2013-04-16 19:26:48 +0200 | 
| commit | b8ad4f02a2124c9e08570bfb2ab05f2024cb2fb7 (patch) | |
| tree | 8fe9b3fedc00fde484e90c0a54120d2089b8821e | |
| parent | b625bc2c31e9434135e077c00d96eb8f05f80a3e (diff) | |
Arguments as parameter to function _real_main so it can be used programmatically
| -rw-r--r-- | youtube_dl/__init__.py | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index f46143e01..b339427e8 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:  | 
