Simplify code

Author: matteofigus

s3fs/core.py

@@ -721,11 +721,10 @@ def touch(self, path, truncate=True, data=None, **kwargs):
             write_result = self.call_s3(
                 self.s3.put_object, kwargs, Bucket=bucket, Key=key
             )
-            if self.version_aware:
-                self.version_id = write_result.get("VersionId")
         except ClientError as ex:
             raise translate_boto_error(ex) from ex
         self.invalidate_cache(self._parent(path))
+        return write_result
 
     async def _cat_file(self, path, version_id=None, start=None, end=None):
         bucket, key, vers = self.split_path(path)
@@ -1711,10 +1710,7 @@ def commit(self):
             if self.buffer is not None:
                 logger.debug("Empty file committed %s" % self)
                 self._abort_mpu()
-                self.fs.touch(self.path)
-                if self.fs.version_aware and self.fs.version_id:
-                    self.version_id = self.fs.version_id
-
+                write_result = self.fs.touch(self.path)
         elif not self.parts:
             if self.buffer is not None:
                 logger.debug("One-shot upload of %s" % self)
@@ -1727,8 +1723,6 @@ def commit(self):
                     Body=data,
                     **self.kwargs,
                 )
-                if self.fs.version_aware:
-                    self.version_id = write_result.get("VersionId")
             else:
                 raise RuntimeError
         else:
@@ -1741,9 +1735,9 @@ def commit(self):
                 UploadId=self.mpu["UploadId"],
                 MultipartUpload=part_info,
             )
-            if self.fs.version_aware:
-                self.version_id = write_result.get("VersionId")
 
+        if self.fs.version_aware:
+            self.version_id = write_result.get("VersionId")
         # complex cache invalidation, since file's appearance can cause several
         # directories
         self.buffer = None