sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Run ruff --fix vdirsyncer

Browse source
This commit is contained in:
Justin ! 2023-07-14 01:52:56 -04:00 committed by Hugo
parent ef8e8980d1
commit 439f1e6f50
4 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vdirsyncer/cli/tasks.py
View file

@ -121,9 +121,7 @@ async def repair_collection(
break break
else: else:
raise exceptions.UserError( raise exceptions.UserError(
"Couldn't find collection {} for storage {}.".format( f"Couldn't find collection {collection} for storage {storage_name}."
collection, storage_name
)
) )
config["type"] = storage_type config["type"] = storage_type

4
vdirsyncer/cli/utils.py
View file

@ -323,9 +323,7 @@ def assert_permissions(path, wanted):
permissions = os.stat(path).st_mode & 0o777 permissions = os.stat(path).st_mode & 0o777
if permissions > wanted: if permissions > wanted:
cli_logger.warning( cli_logger.warning(
"Correcting permissions of {} from {:o} to {:o}".format( f"Correcting permissions of {path} from {permissions:o} to {wanted:o}"
path, permissions, wanted
)
) )
os.chmod(path, wanted) os.chmod(path, wanted)

12
vdirsyncer/storage/dav.py
View file

@ -198,9 +198,7 @@ class Discover:
# E.g. Synology NAS # E.g. Synology NAS
# See https://github.com/pimutils/vdirsyncer/issues/498 # See https://github.com/pimutils/vdirsyncer/issues/498
dav_logger.debug( dav_logger.debug(
"No current-user-principal returned, re-using URL {}".format( f"No current-user-principal returned, re-using URL {response.url}"
response.url
)
) )
return response.url.human_repr() return response.url.human_repr()
return urlparse.urljoin(str(response.url), rv.text).rstrip("/") + "/" return urlparse.urljoin(str(response.url), rv.text).rstrip("/") + "/"
@ -649,9 +647,7 @@ class DAVStorage(Storage):
contenttype = getattr(props.find("{DAV:}getcontenttype"), "text", None) contenttype = getattr(props.find("{DAV:}getcontenttype"), "text", None)
if not self._is_item_mimetype(contenttype): if not self._is_item_mimetype(contenttype):
dav_logger.debug( dav_logger.debug(
"Skipping {!r}, {!r} != {!r}.".format( f"Skipping {href!r}, {contenttype!r} != {self.item_mimetype!r}."
href, contenttype, self.item_mimetype
)
) )
continue continue
@ -831,9 +827,7 @@ class CalDAVStorage(DAVStorage):
start = start.strftime(CALDAV_DT_FORMAT) start = start.strftime(CALDAV_DT_FORMAT)
end = end.strftime(CALDAV_DT_FORMAT) end = end.strftime(CALDAV_DT_FORMAT)
timefilter = '<C:time-range start="{start}" end="{end}"/>'.format( timefilter = f'<C:time-range start="{start}" end="{end}"/>'
start=start, end=end
)
else: else:
timefilter = "" timefilter = ""

4
vdirsyncer/sync/__init__.py
View file

@ -205,9 +205,7 @@ class Upload(Action):
href = etag = None href = etag = None
else: else:
sync_logger.info( sync_logger.info(
"Copying (uploading) item {} to {}".format( f"Copying (uploading) item {self.ident} to {self.dest.storage}"
self.ident, self.dest.storage
)
) )
href, etag = await self.dest.storage.upload(self.item) href, etag = await self.dest.storage.upload(self.item)
assert href is not None assert href is not None