mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Fix line which are too long
This commit is contained in:
parent
20cc1247ed
commit
01fa614b6b
4 changed files with 9 additions and 7 deletions
|
|
@ -36,8 +36,8 @@ async def prepare_pair(pair_name, collections, config, *, connector):
|
||||||
config_a, config_b = all_collections[collection_name]
|
config_a, config_b = all_collections[collection_name]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise exceptions.UserError(
|
raise exceptions.UserError(
|
||||||
f"Pair {pair_name}: Collection {json.dumps(collection_name)} not found. These are the "
|
f"Pair {pair_name}: Collection {json.dumps(collection_name)} not found."
|
||||||
f"configured collections:\n{list(all_collections)}"
|
f"These are the configured collections:\n{list(all_collections)}"
|
||||||
)
|
)
|
||||||
|
|
||||||
collection = CollectionConfig(pair, collection_name, config_a, config_b)
|
collection = CollectionConfig(pair, collection_name, config_a, config_b)
|
||||||
|
|
|
||||||
|
|
@ -79,9 +79,9 @@ def handle_cli_error(status_name=None, e=None):
|
||||||
cli_logger.critical(e)
|
cli_logger.critical(e)
|
||||||
except StorageEmpty as e:
|
except StorageEmpty as e:
|
||||||
cli_logger.error(
|
cli_logger.error(
|
||||||
f'{status_name}: Storage "{e.empty_storage.instance_name}" was completely emptied. If you '
|
f'{status_name}: Storage "{e.empty_storage.instance_name}" was '
|
||||||
"want to delete ALL entries on BOTH sides, then use "
|
"completely emptied. If you want to delete ALL entries on BOTH sides,"
|
||||||
f"`vdirsyncer sync --force-delete {status_name}`. "
|
f"then use `vdirsyncer sync --force-delete {status_name}`. "
|
||||||
f"Otherwise delete the files for {status_name} in your status "
|
f"Otherwise delete the files for {status_name} in your status "
|
||||||
"directory."
|
"directory."
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,8 @@ def prepare_auth(auth, username, password):
|
||||||
return DigestAuthMethod(username, password)
|
return DigestAuthMethod(username, password)
|
||||||
if auth == "guess":
|
if auth == "guess":
|
||||||
raise exceptions.UserError(
|
raise exceptions.UserError(
|
||||||
"'Guess' authentication is not supported in this version of vdirsyncer. \n"
|
"'Guess' authentication is not supported in this version of "
|
||||||
|
"vdirsyncer.\n"
|
||||||
"Please explicitly specify either 'basic' or 'digest' auth instead. \n"
|
"Please explicitly specify either 'basic' or 'digest' auth instead. \n"
|
||||||
"See the following issue for more information: "
|
"See the following issue for more information: "
|
||||||
"https://github.com/pimutils/vdirsyncer/issues/1015"
|
"https://github.com/pimutils/vdirsyncer/issues/1015"
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,8 @@ class Storage(metaclass=StorageMeta):
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return f"<{self.__class__.__name__}(**{ ({x: getattr(self, x) for x in self._repr_attributes}) })>"
|
attrs = {x: getattr(self, x) for x in self._repr_attributes}
|
||||||
|
return f"<{self.__class__.__name__}(**{attrs})>"
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
async def list(self) -> list[tuple]:
|
async def list(self) -> list[tuple]:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue