summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-15 02:07:26 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-15 02:07:26 +0200
commita4fd04158eb7e570a0b2d27f6d9b6b9360644807 (patch)
tree2f01791aab41563ac90a3bf495d9d5fa7d5da371
parent44a5f1718a5657a08082d8fd3201403bf2683c4f (diff)
downloadyoutube-dl-a4fd04158eb7e570a0b2d27f6d9b6b9360644807.tar.gz
youtube-dl-a4fd04158eb7e570a0b2d27f6d9b6b9360644807.tar.xz
youtube-dl-a4fd04158eb7e570a0b2d27f6d9b6b9360644807.zip
Do not import *
-rw-r--r--youtube_dl/PostProcessor.py10
-rw-r--r--youtube_dl/__init__.py36
2 files changed, 39 insertions, 7 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 039e01498..13b56ede5 100644
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -2,9 +2,15 @@ import os
 import subprocess
 import sys
 import time
-import datetime
 
-from .utils import *
+
+from .utils import (
+    compat_subprocess_get_DEVNULL,
+    encodeFilename,
+    PostProcessingError,
+    shell_quote,
+    subtitles_filename,
+)
 
 
 class PostProcessor(object):
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f79b7796c..5248a92c7 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -47,17 +47,43 @@ import shlex
 import socket
 import subprocess
 import sys
-import warnings
+import traceback
 import platform
 
 
-from .utils import *
+from .utils import (
+    compat_cookiejar,
+    compat_print,
+    compat_str,
+    compat_urllib_request,
+    DateRange,
+    decodeOption,
+    determine_ext,
+    DownloadError,
+    get_cachedir,
+    make_HTTPS_handler,
+    MaxDownloadsReached,
+    platform_name,
+    preferredencoding,
+    SameFileError,
+    std_headers,
+    write_string,
+    YoutubeDLHandler,
+)
 from .update import update_self
 from .version import __version__
-from .FileDownloader import *
+from .FileDownloader import (
+    FileDownloader,
+)
 from .extractor import gen_extractors
 from .YoutubeDL import YoutubeDL
-from .PostProcessor import *
+from .PostProcessor import (
+    FFmpegMetadataPP,
+    FFmpegVideoConvertor,
+    FFmpegExtractAudioPP,
+    FFmpegEmbedSubtitlePP,
+)
+
 
 def parseOpts(overrideArguments=None):
     def _readOptions(filename_bytes):
@@ -689,7 +715,7 @@ def _real_main(argv=None):
     if opts.cookiefile is not None:
         try:
             jar.save()
-        except (IOError, OSError) as err:
+        except (IOError, OSError):
             sys.exit(u'ERROR: unable to save cookie jar')
 
     sys.exit(retcode)