Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 29, 2024
1 parent 8874036 commit 8517ff0
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 25 deletions.
6 changes: 3 additions & 3 deletions platform_storage_api/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -773,9 +773,9 @@ async def handle_error_if_streamed(
if response.prepared:
error_dict = dict(
error=str_error,
errno=errorcode[errno]
if errno is not None and errno in errorcode
else errno,
errno=(
errorcode[errno] if errno is not None and errno in errorcode else errno
),
)
await response.write(json.dumps(error_dict).encode())
else:
Expand Down
41 changes: 20 additions & 21 deletions platform_storage_api/fs/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,22 +363,21 @@ async def _iterate_in_chunks(
yield chunk

def _scandir_iter(self, path: PurePath) -> Iterator[FileStatus]:
with self._resolve_dir_fd(path) as dirfd:
with os.scandir(dirfd) as scandir_it:
for entry in scandir_it:
if entry.is_symlink():
target = os.readlink(entry.name, dir_fd=dirfd)
yield self._create_linkstatus(
PurePath(entry.name),
entry.stat(follow_symlinks=False),
target=target,
)
else:
yield self._create_filestatus(
PurePath(entry.name),
entry.stat(follow_symlinks=False),
entry.is_dir(follow_symlinks=False),
)
with self._resolve_dir_fd(path) as dirfd, os.scandir(dirfd) as scandir_it:
for entry in scandir_it:
if entry.is_symlink():
target = os.readlink(entry.name, dir_fd=dirfd)
yield self._create_linkstatus(
PurePath(entry.name),
entry.stat(follow_symlinks=False),
target=target,
)
else:
yield self._create_filestatus(
PurePath(entry.name),
entry.stat(follow_symlinks=False),
entry.is_dir(follow_symlinks=False),
)

async def _iterstatus_iter(
self, dir_iter: Iterator[FileStatus]
Expand Down Expand Up @@ -566,11 +565,11 @@ async def remove(self, path: PurePath, *, recursive: bool = False) -> None:
await self._loop.run_in_executor(self._executor, self._remove, path, recursive)

def _rename(self, old: PurePath, new: PurePath) -> None:
with self._resolve_dir_fd(old.parent) as src_dir_fd:
with self._resolve_dir_fd(new.parent) as dst_dir_fd:
os.rename(
old.name, new.name, src_dir_fd=src_dir_fd, dst_dir_fd=dst_dir_fd
)
with (
self._resolve_dir_fd(old.parent) as src_dir_fd,
self._resolve_dir_fd(new.parent) as dst_dir_fd,
):
os.rename(old.name, new.name, src_dir_fd=src_dir_fd, dst_dir_fd=dst_dir_fd)

async def rename(self, old: PurePath, new: PurePath) -> None:
await self._loop.run_in_executor(self._executor, self._rename, old, new)
Expand Down
2 changes: 1 addition & 1 deletion platform_storage_api/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ async def rename(

@trace
async def disk_usage(
self, path: Optional[Union[PurePath, str]] = None
self, path: Union[PurePath, str, None] = None
) -> DiskUsageInfo:
real_path = await self._path_resolver.resolve_path(PurePath(path or "/"))
return await self._fs.disk_usage(real_path)

0 comments on commit 8517ff0

Please sign in to comment.