ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make UserManager errors less redundant

Browse Source
This commit is contained in:
flan 2018-08-28 17:26:26 +02:00
parent 59fcf9e8c1
commit dbdb3ffb3b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ankisyncd/users.py
View File

@ -49,8 +49,7 @@ class SqliteUserManager(SimpleUserManager):
def user_list(self): def user_list(self):
if not self.auth_db_exists(): if not self.auth_db_exists():
raise ValueError("Cannot list users for nonexistent auth db {}." raise ValueError("Auth DB {} doesn't exist".format(self.auth_db_path))
.format(self.auth_db_path))
conn = sqlite.connect(self.auth_db_path) conn = sqlite.connect(self.auth_db_path)
cursor = conn.cursor() cursor = conn.cursor()
@ -67,8 +66,7 @@ class SqliteUserManager(SimpleUserManager):
def del_user(self, username): def del_user(self, username):
if not self.auth_db_exists(): if not self.auth_db_exists():
raise ValueError("Cannot remove user from nonexistent auth db {}." raise ValueError("Auth DB {} doesn't exist".format(self.auth_db_path))
.format(self.auth_db_path))
conn = sqlite.connect(self.auth_db_path) conn = sqlite.connect(self.auth_db_path)
cursor = conn.cursor() cursor = conn.cursor()
@ -101,11 +99,9 @@ class SqliteUserManager(SimpleUserManager):
def set_password_for_user(self, username, new_password): def set_password_for_user(self, username, new_password):
if not self.auth_db_exists(): if not self.auth_db_exists():
raise ValueError("Cannot remove user from nonexistent auth db {}" raise ValueError("Auth DB {} doesn't exist".format(self.auth_db_path))
.format(self.auth_db_path))
elif not self.user_exists(username): elif not self.user_exists(username):
raise ValueError("Cannot remove nonexistent user {}" raise ValueError("User {} doesn't exist".format(username))
.format(username))
hash = self._create_pass_hash(username, new_password) hash = self._create_pass_hash(username, new_password)