move TemporaryDirectory from conda.common into gateways.disk.create

conda/common/compat.py

@@ -295,47 +295,3 @@ def ensure_utf8_encoding(value):
         return value
     except UnicodeEncodeError:
         return value
-
-
-class TemporaryDirectory(object):
-    """Create and return a temporary directory.  This has the same
-    behavior as mkdtemp but can be used as a context manager.  For
-    example:
-
-        with TemporaryDirectory() as tmpdir:
-            ...
-
-    Upon exiting the context, the directory and everything contained
-    in it are removed.
-    """
-
-    # Handle mkdtemp raising an exception
-    name = None
-    _closed = False
-
-    def __init__(self, suffix="", prefix='tmp', dir=None):
-        self.name = mkdtemp(suffix, prefix, dir)
-
-    def __repr__(self):
-        return "<{} {!r}>".format(self.__class__.__name__, self.name)
-
-    def __enter__(self):
-        return self.name
-
-    def cleanup(self, _warn=False, _warnings=_warnings):
-        from ..gateways.disk.delete import rm_rf as _rm_rf
-        if self.name and not self._closed:
-            try:
-                _rm_rf(self.name)
-            except (TypeError, AttributeError) as ex:
-                if "None" not in '%s' % (ex,):
-                    raise
-                _rm_rf(self.name)
-            self._closed = True
-
-    def __exit__(self, exc, value, tb):
-        self.cleanup()
-
-    def __del__(self):
-        # Issue a ResourceWarning if implicit cleanup needed
-        self.cleanup(_warn=True)

conda/exports.py

@@ -39,10 +39,12 @@
 
 from .common import compat as _compat  # NOQA
 compat = _compat
-from .common.compat import PY3, StringIO, input, iteritems, on_win, string_types, text_type, itervalues, TemporaryDirectory  # NOQA
-PY3, StringIO,  input, iteritems, string_types, text_type, TemporaryDirectory = PY3, StringIO,  input, iteritems, string_types, text_type, TemporaryDirectory  # NOQA
+from .common.compat import PY3, StringIO, input, iteritems, on_win, string_types, text_type, itervalues # NOQA
+PY3, StringIO,  input, iteritems, string_types, text_type, = PY3, StringIO,  input, iteritems, string_types, text_type  # NOQA
 from .gateways.connection.session import CondaSession  # NOQA
 CondaSession = CondaSession
+from .gateways.disk.create import TemporaryDirectory  # NOQA
+TemporaryDirectory = TemporaryDirectory
 
 from .common.toposort import _toposort  # NOQA
 _toposort = _toposort

conda/gateways/disk/create.py

@@ -31,6 +31,53 @@
 from ...exceptions import BasicClobberError, CondaOSError, maybe_raise
 from ...models.enums import FileMode, LinkType
 
+try:
+    from tempfile import TemporaryDirectory
+except ImportError:
+    class TemporaryDirectory(object):
+        """Create and return a temporary directory.  This has the same
+        behavior as mkdtemp but can be used as a context manager.  For
+        example:
+
+            with TemporaryDirectory() as tmpdir:
+                ...
+
+        Upon exiting the context, the directory and everything contained
+        in it are removed.
+        """
+
+        # Handle mkdtemp raising an exception
+        name = None
+        _closed = False
+
+        def __init__(self, suffix="", prefix='tmp', dir=None):
+            self.name = mkdtemp(suffix, prefix, dir)
+
+        def __repr__(self):
+            return "<{} {!r}>".format(self.__class__.__name__, self.name)
+
+        def __enter__(self):
+            return self.name
+
+        def cleanup(self, _warn=False, _warnings=_warnings):
+            from .delete import rm_rf as _rm_rf
+            if self.name and not self._closed:
+                try:
+                    _rm_rf(self.name)
+                except (TypeError, AttributeError) as ex:
+                    if "None" not in '%s' % (ex,):
+                        raise
+                    _rm_rf(self.name)
+                self._closed = True
+
+        def __exit__(self, exc, value, tb):
+            self.cleanup()
+
+        def __del__(self):
+            # Issue a ResourceWarning if implicit cleanup needed
+            self.cleanup(_warn=True)
+
+
 log = getLogger(__name__)
 stdoutlog = getLogger('conda.stdoutlog')
 

conda/gateways/disk/read.py

@@ -17,7 +17,7 @@
 import conda_package_handling.api
 
 from .link import islink, lexists
-from ...common.compat import TemporaryDirectory
+from .create import TemporaryDirectory
 from ..._vendor.auxlib.collection import first
 from ..._vendor.auxlib.compat import shlex_split_unicode
 from ..._vendor.auxlib.ish import dals

tests/gateways/disk/test_delete.py

@@ -7,9 +7,8 @@
 
 import pytest
 
-from conda.compat import TemporaryDirectory
 from conda.common.compat import on_win
-from conda.gateways.disk.create import create_link, mkdir_p
+from conda.gateways.disk.create import create_link, mkdir_p, TemporaryDirectory
 from conda.gateways.disk.delete import move_to_trash, rm_rf
 from conda.gateways.disk.link import islink, symlink
 from conda.gateways.disk.test import softlink_supported