From d020b0ef9724068eb2668f8f2ab98bee19d380c8 Mon Sep 17 00:00:00 2001 From: "Michael D. Smith" Date: Thu, 29 Aug 2024 07:10:34 -0400 Subject: [PATCH] fix cloud path references --- cloudpathlib/s3/s3client.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cloudpathlib/s3/s3client.py b/cloudpathlib/s3/s3client.py index b867cc00..cc1a7426 100644 --- a/cloudpathlib/s3/s3client.py +++ b/cloudpathlib/s3/s3client.py @@ -157,7 +157,6 @@ def __init__( def _get_metadata(self, cloud_path: S3Path) -> Dict[str, Any]: # get accepts all download extra args size = None - path = f"s3://{cloud_path.bucket}/{cloud_path.key}" size = self._metadata_cache[cloud_path].size if size: return { @@ -171,7 +170,7 @@ def _get_metadata(self, cloud_path: S3Path) -> Dict[str, Any]: data = self.s3.ObjectSummary(cloud_path.bucket, cloud_path.key).get( **self.boto3_dl_extra_args ) - self._set_metadata_cache(path, "file", data["ETag"], data["ContentLength"], data["LastModified"]) + self._set_metadata_cache(cloud_path, "file", data["ETag"], data["ContentLength"], data["LastModified"]) return { "last_modified": data["LastModified"], "size": data["ContentLength"], @@ -289,7 +288,7 @@ def _list_dir(self, cloud_path: S3Path, recursive=False) -> Iterable[Tuple[S3Pat parent_canonical = prefix + str(parent).rstrip("/") if parent_canonical not in yielded_dirs and str(parent) != ".": path = self.CloudPath(f"s3://{cloud_path.bucket}/{parent_canonical}") - self._set_metadata_cache(path, "dir", etag, size, last_modified) + self._set_metadata_cache(cloud_path, "dir", etag, size, last_modified) yield ( path, True, @@ -304,7 +303,7 @@ def _list_dir(self, cloud_path: S3Path, recursive=False) -> Iterable[Tuple[S3Pat # s3 fake directories have 0 size and end with "/" if result_key.get("Key").endswith("/") and result_key.get("Size") == 0: path = self.CloudPath(f"s3://{cloud_path.bucket}/{canonical}") - self._set_metadata_cache(path, "dir", etag, size, last_modified) + self._set_metadata_cache(cloud_path, "dir", etag, size, last_modified) yield ( path, True, @@ -314,7 +313,7 @@ def _list_dir(self, cloud_path: S3Path, recursive=False) -> Iterable[Tuple[S3Pat # yield object as file else: path = self.CloudPath(f"s3://{cloud_path.bucket}/{result_key.get('Key')}") - self._set_metadata_cache(path, "file", etag, size, last_modified) + self._set_metadata_cache(cloud_path, "file", etag, size, last_modified) yield ( path, False,