Skip to content

Commit 2acec4e

Browse files
committed
Better fix for lock metadata handling in write_file
1 parent f8f393c commit 2acec4e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

cs3client/file.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ def touch_file(self, auth_token: tuple, resource: Resource) -> None:
170170
self._log.debug(f'msg="Invoked TouchFile" trace="{res.status.trace}"')
171171

172172
def write_file(
173-
self, auth_token: tuple, resource: Resource, content: Union[str, bytes], size: int, lock_md: tuple = None
173+
self, auth_token: tuple, resource: Resource, content: Union[str, bytes], size: int,
174+
app_name: str = None, lock_id: str = None
174175
) -> None:
175176
"""
176177
Write a file using the given userid as access token. The entire content is written
@@ -182,16 +183,14 @@ def write_file(
182183
:param resource: Resource to write content to
183184
:param content: content to write
184185
:param size: size of content (optional)
185-
:param lock_md: tuple (<app_name>, <lock_id>) (optional)
186+
:param app_name: application name (optional)
187+
:param lock_id: lock id (optional)
186188
:return: None (Success)
187189
:raises: FileLockedException (File is locked),
188190
:raises: AuthenticationException (Authentication failed)
189191
:raises: UnknownException (Unknown error)
190192
191193
"""
192-
app_name = lock_id = ''
193-
if lock_md:
194-
app_name, lock_id = lock_md
195194
tstart = time.time()
196195
# prepare endpoint
197196
if size == -1:

0 commit comments

Comments
 (0)