From 7b9a50d67d1db0a3812130f58a56eb43c58e168e Mon Sep 17 00:00:00 2001
From: Andreas Poehlmann <andreas@poehlmann.io>
Date: Tue, 3 Oct 2023 17:55:06 +0200
Subject: [PATCH] upath.core312plus: fix typing issues

---
 upath/core312plus.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/upath/core312plus.py b/upath/core312plus.py
index 47f5290d..f3a3b660 100644
--- a/upath/core312plus.py
+++ b/upath/core312plus.py
@@ -7,8 +7,11 @@
 from copy import copy
 from pathlib import Path
 from pathlib import PurePath
+from typing import TYPE_CHECKING
 from typing import Any
+from typing import Self
 from typing import TypeAlias
+from typing import cast
 from urllib.parse import urlsplit
 
 from fsspec import AbstractFileSystem
@@ -36,7 +39,7 @@ def join(__path: PathOrStr, *paths: PathOrStr) -> str:
     @staticmethod
     def splitroot(__path: PathOrStr) -> tuple[str, str, str]:
         path = strip_upath_protocol(__path)
-        return posixpath.splitroot(path)
+        return posixpath.splitroot(path)  # type: ignore
 
     @staticmethod
     def splitdrive(__path: PathOrStr) -> tuple[str, str]:
@@ -59,7 +62,11 @@ def split_upath_protocol(pth: str) -> str:
     return ""
 
 
-def strip_upath_protocol(pth: str) -> str:
+def strip_upath_protocol(pth: PathOrStr) -> str:
+    if isinstance(pth, PurePath):
+        pth = str(pth)
+    elif not isinstance(pth, str):
+        pth = os.fspath(pth)
     if m := _PROTOCOL_RE.match(pth):
         protocol = m.group("protocol")
         path = m.group("path")
@@ -107,6 +114,11 @@ class UPath(Path):
         "_storage_options",
         "_fs_cached",
     )
+    if TYPE_CHECKING:
+        _protocol: str
+        _storage_options: dict[str, Any]
+        _fs_cached: AbstractFileSystem
+
     pathmod = _flavour = fsspecpathmod
 
     def __new__(
@@ -139,7 +151,7 @@ def __new__(
             raise ValueError(f"Unsupported filesystem: {pth_protocol!r}")
 
         # create a new instance
-        obj = object.__new__(upath_cls)
+        obj: UPath = cast("UPath", object.__new__(upath_cls))
         obj._protocol = pth_protocol
 
         if cls is not UPath and not issubclass(upath_cls, cls):
@@ -153,7 +165,9 @@ def __new__(
                 f" override the default implementation for {pth_protocol!r}."
             )
             warnings.warn(msg, DeprecationWarning, stacklevel=2)
-            upath_cls.__init__(obj, *args, protocol=pth_protocol, **storage_options)
+            upath_cls.__init__(
+                obj, *args, protocol=pth_protocol, **storage_options
+            )  # type: ignore
 
         return obj
 
@@ -376,10 +390,10 @@ def home(cls):
         else:
             raise NotImplementedError
 
-    def absolute(self):
+    def absolute(self) -> Self:
         return self
 
-    def resolve(self, strict=False):
+    def resolve(self, strict: bool = False) -> Self:
         _parts = self.parts
 
         # Do not attempt to normalize path if no parts are dots