aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-13 07:58:44 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-13 07:58:44 +0200
commit2daabe49921227f1a2fc3fd4234e6ecfa7af4cfd (patch)
tree53a32f03147f55c447e633d094b9821517c76e46 /youtube_dl
parent34a741a8eccb5d4b61ae8f7c840d8475f9f3871d (diff)
[options] Correct option usage
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/__init__.py4
-rw-r--r--youtube_dl/options.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index cc0a4071f..42d0a0180 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -86,6 +86,9 @@ import random
import sys
+from .options import (
+ parseOpts,
+)
from .utils import (
compat_getpass,
compat_print,
@@ -94,7 +97,6 @@ from .utils import (
decodeOption,
DownloadError,
MaxDownloadsReached,
- parseOpts,
preferredencoding,
read_batch_urls,
SameFileError,
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index d8c161c9e..31baab469 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import os.path
import optparse
import shlex