Inline no-op function utils.convert_path

Author: c0llab0rat0r

ipfshttpclient/http_common.py

@@ -718,7 +718,7 @@ def download(
 
 			fileobj = ReadableStreamWrapper(res)  # type: ty.IO[bytes]  # type: ignore[assignment]
 			with tarfile.open(fileobj=fileobj, mode=mode) as tf:
-				tf.extractall(path=utils.convert_path(target))
+				tf.extractall(path=target)
 		finally:
 			for closable in closables:
-				closable.close()
+				closable.close()

ipfshttpclient/multipart.py

@@ -386,9 +386,6 @@ def __init__(self, directory: ty.Union[ty.AnyStr, utils.PathLike[ty.AnyStr], int
 	             recursive: bool = False) -> None:
 		self.follow_symlinks = follow_symlinks
 
-		if not isinstance(directory, int):
-			directory = utils.convert_path(directory)
-		
 		# Create file scanner from parameters
 		self.scanner = filescanner.walk(
 			directory,
@@ -401,7 +398,7 @@ def __init__(self, directory: ty.Union[ty.AnyStr, utils.PathLike[ty.AnyStr], int
 		# Figure out the absolute path of the directory added
 		self.abspath = None
 		if not isinstance(directory, int):
-			self.abspath = os.path.abspath(utils.convert_path(directory))
+			self.abspath = os.path.abspath(directory)
 
 		# Figure out basename of the containing directory
 		# (normpath is an acceptable approximation here)
@@ -570,7 +567,7 @@ def stream_filesystem_node(
 	"""
 	is_dir = False
 	if isinstance(filepaths, utils.path_types):
-		is_dir = os.path.isdir(utils.convert_path(filepaths))
+		is_dir = os.path.isdir(filepaths)
 	elif isinstance(filepaths, int):
 		import stat
 		is_dir = stat.S_ISDIR(os.fstat(filepaths).st_mode)

ipfshttpclient/utils.py

@@ -49,31 +49,6 @@ def __fspath__(self) -> ty.AnyStr:
 path_obj_types = (os.PathLike,)
 
 
-@ty.overload
-def convert_path(path: ty.AnyStr) -> ty.AnyStr:
-	...
-
-
-@ty.overload
-def convert_path(path: PathLike_str) -> PathLike_str:
-	...
-
-
-@ty.overload
-def convert_path(path: PathLike_bytes) -> PathLike_bytes:
-	...
-
-
-@ty.overload
-def convert_path(path: AnyPath) -> AnyPath:
-	...
-
-
-def convert_path(path: AnyPath) -> AnyPath:
-	# Not needed since all system APIs also accept an `os.PathLike`
-	return path
-
-
 # work around GH/mypy/mypy#731: no recursive structural types yet
 json_primitive_t = ty.Union[bool, float, int, str]
 json_value_t = ty.Union[
@@ -143,7 +118,7 @@ def clean_file(file: clean_file_t) -> ty.Tuple[ty.IO[bytes], bool]:
 		return os.fdopen(file, 'rb', closefd=False), True
 	elif not hasattr(file, 'read'):
 		file = ty.cast(path_t, file)  # Cannot be ty.IO[bytes] without `.read()`
-		return open(convert_path(file), 'rb'), True
+		return open(file, 'rb'), True
 	else:
 		file = ty.cast(ty.IO[bytes], file)  # Must be ty.IO[bytes]
 		return file, False
@@ -186,10 +161,11 @@ class return_field(ty.Generic[T]):
 		The response field to be returned for all invocations
 	"""
 	__slots__ = ("field",)
-	#field: str
+
+	field: str
 
 	def __init__(self, field: str) -> None:
-		self.field = field  # type: str
+		self.field = field
 
 	def __call__(self, cmd: F) -> ty.Callable[..., T]:
 		"""Wraps a command so that only a specified field is returned.