tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use %r n error messages for token names

Browse Source
This commit is contained in:
Unrud 2017-06-02 14:18:39 +02:00 committed by GitHub
parent 9ceae0a751
commit 07c792f14e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicale/storage.py
View File

@ -857,10 +857,10 @@ class Collection(BaseCollection):
if old_token: if old_token:
# Extract the token name from the sync token # Extract the token name from the sync token
if not old_token.startswith("http://radicale.org/ns/sync/"): if not old_token.startswith("http://radicale.org/ns/sync/"):
raise ValueError("Malformed token: %s" % old_token) raise ValueError("Malformed token: %r" % old_token)
old_token_name = old_token[len("http://radicale.org/ns/sync/"):] old_token_name = old_token[len("http://radicale.org/ns/sync/"):]
if not check_token_name(old_token_name): if not check_token_name(old_token_name):
raise ValueError("Malformed token: %s" % old_token) raise ValueError("Malformed token: %r" % old_token)
# Get the current state and sync-token of the collection. # Get the current state and sync-token of the collection.
state = {} state = {}
token_name_hash = md5() token_name_hash = md5()
@ -898,7 +898,7 @@ class Collection(BaseCollection):
os.remove(old_token_path) os.remove(old_token_path)
except (FileNotFoundError, PermissionError): except (FileNotFoundError, PermissionError):
pass pass
raise ValueError("Token not found: %s" % old_token) raise ValueError("Token not found: %r" % old_token)
# write the new token state or update the modification time of # write the new token state or update the modification time of
# existing token state # existing token state
if not os.path.exists(token_path): if not os.path.exists(token_path):