fix: check for 404 and use proper key variable

seung-lab · Mar 16, 2024 · 7d8183c · 7d8183c
1 parent ce77685
commit 7d8183c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cloudfiles/cloudfiles.py b/cloudfiles/cloudfiles.py
@@ -1247,7 +1247,7 @@ def thunk_copy(key):
         found = conn.copy_file(src_key, cf_dest._path.bucket, dest_key)
 
       if found == False and not allow_missing:
-        raise FileNotFoundError(key["path"])
+        raise FileNotFoundError(src_key)
 
       return int(found)
 

diff --git a/cloudfiles/interfaces.py b/cloudfiles/interfaces.py
@@ -931,7 +931,7 @@ def copy_file(self, src_path, dest_bucket_name, dest_key):
     try:
       dest_bucket.copy(CopySource=copy_source, Bucket=dest_bucket_name, Key=dest_key)
     except botocore.exceptions.ClientError as err: 
-      if err.response['Error']['Code'] == 'NoSuchKey':
+      if err.response['Error']['Code'] in ('NoSuchKey', '404'):
         return False
       else:
         raise