S3: Fix deadlock in list_object_versions after multipart upload (#5742)

2022-12-09 23:09:05 +01:00 · 2022-12-09 23:09:05 +01:00 · 9be9edf8fa
commit 9be9edf8fa
parent 4ac9e91dfd
1 changed files with 5 additions and 6 deletions
--- a/moto/s3/models.py
+++ b/moto/s3/models.py
@ -161,12 +161,11 @@ class FakeKey(BaseModel, ManagedState):

    @property
    def value(self):
-        self.lock.acquire()
-        self._value_buffer.seek(0)
-        r = self._value_buffer.read()
-        r = copy.copy(r)
-        self.lock.release()
-        return r
+        with self.lock:
+            self._value_buffer.seek(0)
+            r = self._value_buffer.read()
+            r = copy.copy(r)
+            return r

    @property
    def arn(self):