Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if something is in a dict with a simpler way

Browse Source 
* Replace `data.get("key", None) is not None` with `"key" in data`
This commit is contained in:
luukas 2022-05-25 00:39:16 +03:00
parent 2aa2d14f5e
commit b0d342e949
No known key found for this signature in database
GPG Key ID: CC4915E8D71FC044
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/classes/web/routes/api/users/user/index.py
View File

@ -175,7 +175,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
},
)
if data.get("username", None) is not None:
if "username" in data:
if data["username"].lower() in ["system", ""]:
return self.finish_json(
400, {"status": "error", "error": "INVALID_USERNAME"}
@ -185,7 +185,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
400, {"status": "error", "error": "USER_EXISTS"}
)
if data.get("superuser", None) is not None:
if "superuser" in data:
if str(user["user_id"]) == str(user_id):
# Checks if user is trying to change super user status of self.
# We don't want that.
@ -196,7 +196,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
# The user is not superuser so they can't change the superuser status
data.pop("superuser")
if data.get("permissions", None) is not None:
if "permissions" in data:
if str(user["user_id"]) == str(user_id):
# Checks if user is trying to change permissions of self.
# We don't want that.
@ -210,7 +210,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
400, {"status": "error", "error": "INVALID_PERMISSIONS_MODIFY"}
)
if data.get("roles", None) is not None:
if "roles" in data:
if str(user["user_id"]) == str(user_id):
# Checks if user is trying to change roles of self.
# We don't want that.
@ -224,9 +224,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
400, {"status": "error", "error": "INVALID_ROLES_MODIFY"}
)
if data.get("password", None) is not None and str(
user["user_id"] == str(user_id)
):
if "password" in data and str(user["user_id"] == str(user_id)):
# TODO: edit your own password
return self.finish_json(
400, {"status": "error", "error": "INVALID_PASSWORD_MODIFY"}