diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index 7a4f832f3..28ae98a55 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -2925,23 +2925,6 @@ except TypeError: # Python 2.6 n += step -try: - from tempfile import TemporaryDirectory as compat_TemporaryDirectory -except ImportError: - class compat_TemporaryDirectory: - def __init__(self, prefix=None): - self._prefix = prefix - self._path = None - - def __enter__(self): - self._path = tempfile.mkdtemp(prefix=self._prefix) - return self._path - - def __exit__(self, exc_type, exc_val, exc_tb): - if self._path is not None: - shutil.rmtree(self._path) - - if sys.version_info >= (3, 0): from tokenize import tokenize as compat_tokenize_tokenize else: @@ -2981,6 +2964,23 @@ else: compat_Struct = struct.Struct +try: + from tempfile import TemporaryDirectory as compat_TemporaryDirectory +except ImportError: + class compat_TemporaryDirectory: + def __init__(self, prefix=None): + self._prefix = prefix + self._path = None + + def __enter__(self): + self._path = tempfile.mkdtemp(prefix=self._prefix) + return self._path + + def __exit__(self, exc_type, exc_val, exc_tb): + if self._path is not None: + shutil.rmtree(self._path) + + try: from future_builtins import zip as compat_zip except ImportError: # not 2.6+ or is 3.x @@ -3022,6 +3022,7 @@ __all__ = [ 'compat_HTMLParser', 'compat_HTTPError', 'compat_Struct', + 'compat_TemporaryDirectory', 'compat_b64decode', 'compat_basestring', 'compat_chr', @@ -3059,7 +3060,6 @@ __all__ = [ 'compat_struct_pack', 'compat_struct_unpack', 'compat_subprocess_get_DEVNULL', - 'compat_TemporaryDirectory', 'compat_tokenize_tokenize', 'compat_urllib_error', 'compat_urllib_parse',