globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

fix: python<3.10 union types

Browse source
This commit is contained in:
Éloi Rivard 2024-03-29 10:56:21 +01:00
parent be2fa8b7f5
commit 37d17b43aa
No known key found for this signature in database
GPG key ID: 7EDA204EA57DD184
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
canaille/core/configuration.py
View file

@ -2,6 +2,7 @@ from enum import Enum
from typing import Dict from typing import Dict
from typing import List from typing import List
from typing import Optional from typing import Optional
from typing import Union
from pydantic import BaseModel from pydantic import BaseModel
from pydantic import ValidationInfo from pydantic import ValidationInfo
@ -144,7 +145,7 @@ class ACLSettings(BaseModel):
assert all(field in User.__annotations__ for field in write) assert all(field in User.__annotations__ for field in write)
return write return write
FILTER: Optional[Dict[str, str] | List[Dict[str, str]]] = None FILTER: Optional[Union[Dict[str, str], List[Dict[str, str]]]] = None
""":attr:`FILTER` can be: """:attr:`FILTER` can be:
- :py:data:`None`, in which case all the users will match this access control - :py:data:`None`, in which case all the users will match this access control
@ -255,7 +256,7 @@ class CoreSettings(BaseModel):
Defaults to 2 days. Defaults to 2 days.
""" """
LOGGING: Optional[str | Dict] = None LOGGING: Optional[Union[str, Dict]] = None
"""Configures the logging output using the python logging configuration format: """Configures the logging output using the python logging configuration format:
- if :py:data:`None`, everything is logged in the standard output - if :py:data:`None`, everything is logged in the standard output