Rely on trees for 'path' operation. Passes all but one operation.

jaraco · jaraco · commit dba77ef5231e · 2019-06-02T10:28:12.000-04:00
diff --git a/importlib_resources/_py2.py b/importlib_resources/_py2.py
@@ -1,13 +1,10 @@
 import os
 import errno
-import tempfile
 
 from . import trees
 from ._compat import FileNotFoundError
-from contextlib import contextmanager
 from importlib import import_module
 from io import BytesIO, TextIOWrapper, open as io_open
-from pathlib2 import Path
 
 
 def _resolve(name):
@@ -96,7 +93,12 @@ def read_text(package, resource, encoding='utf-8', errors='strict'):
         return fp.read()
 
 
-@contextmanager
+def get(package, resource):
+    resource = _normalize_path(resource)
+    package = _get_package(package)
+    return trees.from_package(package) / resource
+
+
 def path(package, resource):
     """A context manager providing a file path object to the resource.
 
@@ -106,33 +108,7 @@ def path(package, resource):
     raised if the file was deleted prior to the context manager
     exiting).
     """
-    resource = _normalize_path(resource)
-    package = _get_package(package)
-    package_directory = Path(package.__file__).parent
-    file_path = package_directory / resource
-    # If the file actually exists on the file system, just return it.
-    if file_path.exists():
-        yield file_path
-        return
-
-    # Otherwise, it's probably in a zip file, so we need to create a temporary
-    # file and copy the contents into that file, hence the contextmanager to
-    # clean up the temp file resource.
-    with open_binary(package, resource) as fp:
-        data = fp.read()
-    # Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
-    # blocks due to the need to close the temporary file to work on Windows
-    # properly.
-    fd, raw_path = tempfile.mkstemp()
-    try:
-        os.write(fd, data)
-        os.close(fd)
-        yield Path(raw_path)
-    finally:
-        try:
-            os.remove(raw_path)
-        except FileNotFoundError:
-            pass
+    return trees.as_file(get(package, resource))
 
 
 def is_resource(package, name):
diff --git a/importlib_resources/_py3.py b/importlib_resources/_py3.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import tempfile
 
 from . import abc as resources_abc
 from . import trees
@@ -130,6 +129,15 @@ def read_text(package: Package,
         return fp.read()
 
 
+def get(package: Package, resource: Resource) -> trees.Traversable:
+    """
+    Get a Traversable resource from a package
+    """
+    resource = _normalize_path(resource)
+    package = _get_package(package)
+    return trees.from_package(package) / resource
+
+
 @contextmanager
 def path(package: Package, resource: Resource) -> Iterator[Path]:
     """A context manager providing a file path object to the resource.
@@ -140,38 +148,14 @@ def path(package: Package, resource: Resource) -> Iterator[Path]:
     raised if the file was deleted prior to the context manager
     exiting).
     """
-    resource = _normalize_path(resource)
-    package = _get_package(package)
-    reader = _get_resource_reader(package)
+    norm_resource = _normalize_path(resource)
+    reader = _get_resource_reader(_get_package(package))
     if reader is not None:
         with suppress(FileNotFoundError):
-            yield Path(reader.resource_path(resource))
+            yield Path(reader.resource_path(norm_resource))
             return
-    # Fall-through for both the lack of resource_path() *and* if
-    # resource_path() raises FileNotFoundError.
-    package_directory = Path(package.__spec__.origin).parent
-    file_path = package_directory / resource
-    # If the file actually exists on the file system, just return it.
-    if file_path.exists():
-        yield file_path
-        return
-
-    # Otherwise, it's probably in a zip file, so we need to create a temporary
-    # file and copy the contents into that file, hence the contextmanager to
-    # clean up the temp file resource.
-    with open_binary(package, resource) as fp:
-        data = fp.read()
-    # Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
-    # blocks due to the need to close the temporary file to work on
-    # Windows properly.
-    fd, raw_path = tempfile.mkstemp()
-    try:
-        os.write(fd, data)
-        os.close(fd)
-        yield Path(raw_path)
-    finally:
-        with suppress(FileNotFoundError):
-            os.remove(raw_path)
+    with trees.as_file(get(package, resource)) as res:
+        yield res
 
 
 def is_resource(package: Package, name: str) -> bool:
diff --git a/importlib_resources/trees.py b/importlib_resources/trees.py
@@ -1,9 +1,12 @@
 from __future__ import absolute_import
 
+import os
 import abc
 import zipp
+import tempfile
+import contextlib
 
-from ._compat import ABC, Path, package_spec
+from ._compat import ABC, Path, package_spec, FileNotFoundError
 
 
 class Traversable(ABC):
@@ -49,3 +52,46 @@ def from_package(package):
     except Exception:
         pass
     return package_directory
+
+
+@contextlib.contextmanager
+def _zip_path_as_file(path):
+    # Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
+    # blocks due to the need to close the temporary file to work on Windows
+    # properly.
+    fd, raw_path = tempfile.mkstemp()
+    try:
+        os.write(fd, path.read_bytes())
+        os.close(fd)
+        yield Path(raw_path)
+    finally:
+        try:
+            os.remove(raw_path)
+        except FileNotFoundError:
+            pass
+
+
+@contextlib.contextmanager
+def _local_path_as_file(path):
+    """
+    Degenerate wrapper for pathlib.Path objects
+    """
+    yield path
+
+
+@contextlib.contextmanager
+def as_file(path):
+    """
+    Given a path-like object, return that object as a
+    path on the local file system in a context manager.
+    """
+    if not path.is_file():
+        raise FileNotFoundError(path)
+    # todo: consider using functools.singledispatch
+    wrapper = (
+        _zip_path_as_file
+        if isinstance(path, zipp.Path)
+        else _local_path_as_file
+        )
+    with wrapper(path) as local:
+        yield local
