Merge pull request #30 from brl0/20210804

Fixes #25, #26, #29

upath/core.py

@@ -1,17 +1,28 @@
+from abc import ABCMeta
 import os
 import pathlib
 import urllib
 
 from fsspec.registry import known_implementations, registry
+from fsspec.utils import stringify_path
 
 from upath.registry import _registry
 
 
-class UPath(pathlib.Path):
+class UPathMeta(ABCMeta):
+    def __instancecheck__(cls, instance):
+        return isinstance(instance, pathlib.Path)
+
+    def __subclasscheck__(cls, subclass):
+        return issubclass(subclass, pathlib.Path)
+
+
+class UPath(pathlib.Path, metaclass=UPathMeta):
     def __new__(cls, *args, **kwargs):
-        if cls is UPath:
+        if issubclass(cls, UPath):
             args_list = list(args)
             url = args_list.pop(0)
+            url = stringify_path(url)
             parsed_url = urllib.parse.urlparse(url)
             for key in ["scheme", "netloc"]:
                 val = kwargs.get(key)
@@ -38,4 +49,6 @@ def __new__(cls, *args, **kwargs):
                 args = tuple(args_list)
                 self = cls._from_parts_init(args, init=False)
                 self._init(*args, **kwargs)
+        else:
+            self = super().__new__(*args, **kwargs)
         return self

upath/tests/conftest.py

@@ -1,6 +1,5 @@
 import os
 import tempfile
-import shutil
 from pathlib import Path
 import subprocess
 import shlex
@@ -48,15 +47,14 @@ def clear_registry():
 
 @pytest.fixture()
 def tempdir(clear_registry):
-    tempdir = tempfile.TemporaryDirectory()
-    tempdir = tempdir.name
-    return tempdir
+    with tempfile.TemporaryDirectory() as tempdir:
+        yield tempdir
 
 
 @pytest.fixture()
 def local_testdir(tempdir, clear_registry):
     tmp = Path(tempdir)
-    tmp.mkdir()
+    tmp.mkdir(exist_ok=True)
     folder1 = tmp.joinpath("folder1")
     folder1.mkdir()
     folder1_files = ["file1.txt", "file2.txt"]
@@ -75,7 +73,6 @@ def local_testdir(tempdir, clear_registry):
         yield str(Path(tempdir)).replace("\\", "/")
     else:
         yield tempdir
-    shutil.rmtree(tempdir)
 
 
 @pytest.fixture()

upath/tests/test_core.py

@@ -1,6 +1,7 @@
 import sys
 import pathlib
 import warnings
+from pathlib import Path
 
 import pytest
 
@@ -52,3 +53,34 @@ def test_multiple_backend_paths(local_testdir, s3, hdfs):
     path = f"hdfs:{local_testdir}"
     UPath(path, host=host, user=user, port=port)
     assert s3_path.joinpath("text1.txt")._url.scheme == "s3"
+
+
+def test_constructor_accept_path(local_testdir):
+    path = UPath(pathlib.Path(local_testdir))
+    assert str(path) == str(Path(local_testdir))
+
+
+def test_constructor_accept_upath(local_testdir):
+    path = UPath(UPath(local_testdir))
+    assert str(path) == str(Path(local_testdir))
+
+
+def test_subclass(local_testdir):
+    class MyPath(UPath):
+        pass
+
+    path = MyPath(local_testdir)
+    assert str(path) == str(Path(local_testdir))
+    assert issubclass(MyPath, UPath)
+    assert isinstance(path, pathlib.Path)
+
+
+def test_instance_check(local_testdir):
+    path = UPath(local_testdir)
+    assert isinstance(path, UPath)
+
+
+def test_new_method(local_testdir):
+    path = UPath.__new__(pathlib.Path, local_testdir)
+    assert str(path) == str(Path(local_testdir))
+    assert isinstance(path, pathlib.Path)