aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-11-17 16:47:52 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-11-17 16:47:52 +0100
commitce02ed60f27ea27e66c33af745dc7e716377b46f (patch)
treec9b77eeafe6445887e147b9e522c8760d0e5c25a
parent1e5b9a95fd2049e024b3ee2f13b4da5c308d2e9c (diff)
downloadyoutube-dl-ce02ed60f27ea27e66c33af745dc7e716377b46f.tar.xz
Remove * imports
-rw-r--r--youtube_dl/YoutubeDL.py28
-rw-r--r--youtube_dl/update.py6
2 files changed, 31 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 6ea865bd9..6e5ae44d3 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -16,7 +16,31 @@ import traceback
if os.name == 'nt':
import ctypes
-from .utils import *
+from .utils import (
+ compat_http_client,
+ compat_print,
+ compat_str,
+ compat_urllib_error,
+ compat_urllib_request,
+ ContentTooShortError,
+ date_from_str,
+ DateRange,
+ determine_ext,
+ DownloadError,
+ encodeFilename,
+ ExtractorError,
+ locked_file,
+ MaxDownloadsReached,
+ PostProcessingError,
+ preferredencoding,
+ SameFileError,
+ sanitize_filename,
+ subtitles_filename,
+ takewhile_inclusive,
+ UnavailableVideoError,
+ write_json_file,
+ write_string,
+)
from .extractor import get_info_extractor, gen_extractors
from .FileDownloader import FileDownloader
@@ -267,7 +291,7 @@ class YoutubeDL(object):
"""Report file has already been fully downloaded."""
try:
self.to_screen(u'[download] %s has already been downloaded' % file_name)
- except (UnicodeEncodeError) as err:
+ except UnicodeEncodeError:
self.to_screen(u'[download] The file has already been downloaded')
def increment_downloads(self):
diff --git a/youtube_dl/update.py b/youtube_dl/update.py
index 0689a4891..f41b4785a 100644
--- a/youtube_dl/update.py
+++ b/youtube_dl/update.py
@@ -2,11 +2,15 @@ import io
import json
import traceback
import hashlib
+import os
import subprocess
import sys
from zipimport import zipimporter
-from .utils import *
+from .utils import (
+ compat_str,
+ compat_urllib_request,
+)
from .version import __version__
def rsa_verify(message, signature, key):