Attachment 11126 Details for Bug 56590 – fix deprecated return value check

[patch] fix deprecated return value check

bug_56590.patch (text/plain), 1.43 KB, created by Daniel Tröder on 2023-09-15 07:53:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tröder

Created: 2023-09-15 07:53:57 CEST

Size: 1.43 KB

patch

obsolete

>diff --git kelvin-api/ucsschool/kelvin/routers/user.py kelvin-api/ucsschool/kelvin/routers/user.py
>index 1c098713..6f19e882 100644
>--- kelvin-api/ucsschool/kelvin/routers/user.py
>+++ kelvin-api/ucsschool/kelvin/routers/user.py
>@@ -39,6 +39,7 @@ from fastapi import APIRouter, Body, Depends, HTTPException, Path, Query, Reques
> from ldap.filter import escape_filter_chars
> from pydantic import BaseModel, Field, HttpUrl, SecretStr, ValidationError, root_validator, validator
> 
>+from uldap3.exceptions import ModifyError as UModifyError, NoObject as UNoObject
> from ucsschool.importer.default_user_import_factory import DefaultUserImportFactory
> from ucsschool.importer.exceptions import UcsSchoolImportError
> from ucsschool.importer.factory import Factory
>@@ -1424,11 +1425,11 @@ async def set_password_hashes(dn: str, kelvin_password_hashes: PasswordsHashes)
>     pw_hashes["krb5Key"] = kelvin_password_hashes.krb_5_key_as_bytes
>     for key, value in pw_hashes.items():
>         pw_hashes[key] = value if isinstance(value, list) else [value]
>-    res = uldap.modify(dn, pw_hashes)
>-    if res:
>+    try:
>+        uldap.modify(dn, pw_hashes)
>         logger.info("Successfully set password hashes of %r.", dn)
>-    else:
>-        logger.error("Error modifying password hashes of %r.", dn)
>+    except (UModifyError, UNoObject) as exc:
>+        logger.error("Error modifying password hashes of %r: %s", dn, exc)
> 
> 
> async def fix_case_of_ous(user: User) -> None:

Actions: View | Diff

Attachments on bug 56590: 11126