From b62b2b1f07d0ea70628a4c7ee3f703474e5ea70a Mon Sep 17 00:00:00 2001 From: Trinh Anh Ngoc Date: Sat, 22 Apr 2023 16:08:06 +0700 Subject: [PATCH] Update stubs --- odoo-stubs/fields.pyi | 28 ++++++++++++++-------------- odoo-stubs/http.pyi | 4 ++-- odoo-stubs/tests/common.pyi | 2 -- odoo-stubs/tools/misc.pyi | 4 ++-- odoo-stubs/tools/xml_utils.pyi | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/odoo-stubs/fields.pyi b/odoo-stubs/fields.pyi index 69cecec..8bb0915 100644 --- a/odoo-stubs/fields.pyi +++ b/odoo-stubs/fields.pyi @@ -1,6 +1,6 @@ import datetime import enum -from typing import Any, Callable, Container, Collection, Iterator, Sequence, TypeVar, Union +from typing import Any, Callable, Container, Collection, Iterator, Sequence, Type, TypeVar, Union import psycopg2 from markupsafe import Markup @@ -87,9 +87,9 @@ class Field(metaclass=MetaField): def __init__(self, string: str = ..., **kwargs) -> None: ... def __str__(self) -> str: ... def __repr__(self) -> str: ... - def __set_name__(self, owner: type[BaseModel], name: str) -> None: ... - def _get_attrs(self, model_class: type[BaseModel], name: str) -> dict[str, Any]: ... - def _setup_attrs(self, model_class: type[BaseModel], name: str): ... + def __set_name__(self, owner: Type[BaseModel], name: str) -> None: ... + def _get_attrs(self, model_class: Type[BaseModel], name: str) -> dict[str, Any]: ... + def _setup_attrs(self, model_class: Type[BaseModel], name: str): ... def prepare_setup(self) -> None: ... def setup(self, model: BaseModel) -> None: ... def setup_nonrelated(self, model: BaseModel) -> None: ... @@ -167,14 +167,14 @@ class Field(metaclass=MetaField): class Boolean(Field): type: str - column_type: type[str, str] + column_type: tuple[str, str] def convert_to_column(self, value, record: BaseModel, values: Any | None = ..., validate: bool = ...) -> bool: ... def convert_to_cache(self, value, record: BaseModel, validate: bool = ...) -> bool: ... def convert_to_export(self, value, record: BaseModel): ... class Integer(Field): type: str - column_type: type[str, str] + column_type: tuple[str, str] group_operator: str def convert_to_column(self, value, record: BaseModel, values: Any | None = ..., validate: bool = ...) -> int: ... def convert_to_cache(self, value, record: BaseModel, validate: bool = ...) -> int | None: ... @@ -192,7 +192,7 @@ class Float(Field): def column_type(self): ... def get_digits(self, env: Environment) -> tuple[int, int]: ... _related__digits: Any - def _description_digits(self, env: Environment) -> type[int, int]: ... + def _description_digits(self, env: Environment) -> tuple[int, int]: ... def convert_to_column(self, value, record: BaseModel, values: Any | None = ..., validate: bool = ...) -> float: ... def convert_to_cache(self, value, record: BaseModel, validate: bool = ...) -> float: ... def convert_to_record(self, value, record: BaseModel): ... @@ -240,7 +240,7 @@ class Char(_String): type: str size: int | None trim: bool - def _setup_attrs(self, model_class: type[BaseModel], name: str) -> None: ... + def _setup_attrs(self, model_class: Type[BaseModel], name: str) -> None: ... @property def column_type(self) -> tuple[str, str]: ... def update_db_column(self, model: BaseModel, column: dict | None) -> None: ... @@ -267,7 +267,7 @@ class Html(_String): sanitize_form: bool strip_style: bool strip_classes: bool - def _get_attrs(self, model_class: type[BaseModel], name: str) -> dict[str, Any]: ... + def _get_attrs(self, model_class: Type[BaseModel], name: str) -> dict[str, Any]: ... @property def column_type(self) -> tuple[str, str]: ... _related_sanitize: bool @@ -339,7 +339,7 @@ class Binary(Field): attachment: bool @property def column_type(self) -> tuple[str, str] | None: ... - def _get_attrs(self, model_class: type[BaseModel], name: str) -> dict[str, Any]: ... + def _get_attrs(self, model_class: Type[BaseModel], name: str) -> dict[str, Any]: ... _description_attachment: bool def convert_to_column(self, value, record: BaseModel, values: Any | None = ..., validate: bool = ...) -> psycopg2.Binary | None: ... def convert_to_cache(self, value, record: BaseModel, validate: bool = ...) -> bytes | None: ... @@ -367,8 +367,8 @@ class Selection(Field): def __init__(self, selection: _SelectionRaw = ..., string: str = ..., **kwargs) -> None: ... def setup_nonrelated(self, model: BaseModel) -> None: ... def setup_related(self, model: BaseModel): ... - def _get_attrs(self, model_class: type[BaseModel], name: str) -> dict[str, Any]: ... - def _setup_attrs(self, model_class: type[BaseModel], name: str) -> None: ... + def _get_attrs(self, model_class: Type[BaseModel], name: str) -> dict[str, Any]: ... + def _setup_attrs(self, model_class: Type[BaseModel], name: str) -> None: ... def _selection_modules(self, model: BaseModel) -> dict[str, set[str, str]]: ... def _description_selection(self, env: Environment) -> _Selection: ... def _default_group_expand(self, records: BaseModel, groups, domain, order) -> _Selection: ... @@ -412,7 +412,7 @@ class Many2one(_Relational): auto_join: bool delegate: bool def __init__(self, comodel_name: str = ..., string: str = ..., **kwargs) -> None: ... - def _setup_attrs(self, model_class: type[BaseModel], name: str) -> None: ... + def _setup_attrs(self, model_class: Type[BaseModel], name: str) -> None: ... def setup_nonrelated(self, model: BaseModel) -> None: ... def update_db(self, model: BaseModel, columns): ... def update_db_column(self, model: BaseModel, column) -> None: ... @@ -465,7 +465,7 @@ class Properties(Field): ALLOWED_TYPES: tuple[str, ...] _depends: tuple[str, ...] compute: Callable - def _setup_attrs(self, model_class: type[BaseModel], name: str) -> None: ... + def _setup_attrs(self, model_class: Type[BaseModel], name: str) -> None: ... def convert_to_column(self, value, record: BaseModel, values: Any | None = ..., validate: bool = ...): ... def convert_to_cache(self, value, record: BaseModel, validate: bool = ...): ... def convert_to_record(self, value, record: BaseModel): ... diff --git a/odoo-stubs/http.pyi b/odoo-stubs/http.pyi index 15dd0a6..f40fa5e 100644 --- a/odoo-stubs/http.pyi +++ b/odoo-stubs/http.pyi @@ -94,9 +94,9 @@ class FilesystemSessionStore(sessions.FilesystemSessionStore): def vacuum(self) -> None: ... class Session(MutableMapping): - __slots__ = ('can_save', 'data', 'is_dirty', 'is_explicit', 'is_new', 'should_rotate', 'sid') + __slots__ = ('can_save', '_Session__data', 'is_dirty', 'is_explicit', 'is_new', 'should_rotate', 'sid') can_save: bool - data: dict + __data: dict is_dirty: bool is_explicit: bool is_new: bool diff --git a/odoo-stubs/tests/common.pyi b/odoo-stubs/tests/common.pyi index f252575..e68ef1e 100644 --- a/odoo-stubs/tests/common.pyi +++ b/odoo-stubs/tests/common.pyi @@ -88,8 +88,6 @@ class BaseCase(case.TestCase, metaclass=MetaCase): def debug_mode(self) -> Generator[None, None, None]: ... def _assertRaises(self, exception, *, msg: Any | None = ...) -> Generator[Any, None, None]: ... def assertRaises(self, exception, func: Any | None = ..., *args, **kwargs) -> Generator[Any, None, None] | None: ... - if sys.version_info < (3, 10): - def assertNoLogs(self, logger: str, level: str): ... def assertQueries(self, expected, flush: bool = ...) -> Generator[list, None, None]: ... def assertQueryCount(self, default: int = ..., flush: bool = ..., **counters) -> Generator[None, None, None]: ... def assertRecordValues(self, records: BaseModel, expected_values: list[dict[str, Any]]) -> None: ... diff --git a/odoo-stubs/tools/misc.pyi b/odoo-stubs/tools/misc.pyi index a2a91fe..fe01946 100644 --- a/odoo-stubs/tools/misc.pyi +++ b/odoo-stubs/tools/misc.pyi @@ -238,10 +238,10 @@ def format_amount(env: Environment, amount: float, currency: 'odoo.model.res_cur def format_duration(value: float) -> str: ... consteq: Callable[[str, str], bool] +_PICKLE_SAFE_NAMES: dict class Unpickler(pickle_.Unpickler): - find_global: Any - find_class: Any + def find_class(self, module_name: str, name: str): ... def _pickle_load(stream: pickle_._ReadableFileobj, encoding: str = ..., errors: bool = ...): ... diff --git a/odoo-stubs/tools/xml_utils.pyi b/odoo-stubs/tools/xml_utils.pyi index bb622e8..c5ee92b 100644 --- a/odoo-stubs/tools/xml_utils.pyi +++ b/odoo-stubs/tools/xml_utils.pyi @@ -15,7 +15,7 @@ def create_xml_node_chain(first_parent_node: _Element, nodes_list: Iterable[str] def create_xml_node(parent_node: _Element, node_name: str, node_value: str | None = ...) -> _Element: ... def cleanup_xml_node(xml_node_or_string: _Element | str, remove_blank_text: bool = ..., remove_blank_nodes: bool = ..., indent_level: int = ..., indent_space: str = ...) -> _Element: ... -def load_xsd_files_from_url(env: Environment, url: str, file_name: str, force_reload: bool = ..., request_max_timeout: int = ..., +def load_xsd_files_from_url(env: Environment, url: str, file_name: str | None = ..., force_reload: bool = ..., request_max_timeout: int = ..., xsd_name_prefix: str = ..., xsd_names_filter: str | list[str] | None = ..., modify_xsd_content: Callable[[bytes], bytes] | None = ...) -> 'odoo.model.ir_attachment | Literal[False]': ... def validate_xml_from_attachment(env: Environment, xml_content, xsd_name: str, reload_files_function: Callable | None = ...,