Merge branch 'walla' of https://github.com/lenaten/youtube-dl into lenaten-walla

[youtube-dl] / youtube_dl / __init__.py

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index cc0a4071fe662bb7d85555a0c002c90431de0e54..7f2b4dfcc60ddada121b7b662a61fc10c62de580 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -75,6 +75,10 @@ __authors__  = (
     'Ole Ernst',
     'Aaron McDaniel (mcd1992)',
     'Magnus Kolstad',
+    'Hari Padmanaban',
+    'Carlos Ramos',
+    '5moufl',
+    'lenaten',
 )
 
 __license__ = 'Public Domain'
@@ -86,6 +90,9 @@ import random
 import sys
 
 
+from .options import (
+    parseOpts,
+)
 from .utils import (
     compat_getpass,
     compat_print,
@@ -94,7 +101,6 @@ from .utils import (
     decodeOption,
     DownloadError,
     MaxDownloadsReached,
-    parseOpts,
     preferredencoding,
     read_batch_urls,
     SameFileError,