浏览代码

fix/ignore remaining mypy issues

Falko Schindler 1 年之前
父节点
当前提交
cf7a966535
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 5 5
      nicegui/element.py
  2. 2 2
      nicegui/event_listener.py
  3. 1 1
      nicegui/page.py

+ 5 - 5
nicegui/element.py

@@ -4,14 +4,14 @@ import inspect
 import re
 from copy import copy, deepcopy
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Optional, Sequence, Union
 
 from typing_extensions import Self
 
 from nicegui import json
 
 from . import binding, events, globals, outbox, storage  # pylint: disable=redefined-builtin
-from .dependencies import JsComponent, Library, register_library, register_vue_component
+from .dependencies import Component, Library, register_library, register_vue_component
 from .elements.mixins.visibility import Visibility
 from .event_listener import EventListener
 from .slot import Slot
@@ -24,7 +24,7 @@ PROPS_PATTERN = re.compile(r'([:\w\-]+)(?:=(?:("[^"\\]*(?:\\.[^"\\]*)*")|([\w\-.
 
 
 class Element(Visibility):
-    component: Optional[JsComponent] = None
+    component: Optional[Component] = None
     libraries: List[Library] = []
     extra_libraries: List[Library] = []
     exposed_libraries: List[Library] = []
@@ -252,7 +252,7 @@ class Element(Visibility):
     def on(self,
            type: str,  # pylint: disable=redefined-builtin
            handler: Optional[Callable[..., Any]] = None,
-           args: Optional[List[str]] = None, *,
+           args: Union[None, Sequence[str], Sequence[Optional[Sequence[str]]]] = None, *,
            throttle: float = 0.0,
            leading_events: bool = True,
            trailing_events: bool = True,
@@ -270,7 +270,7 @@ class Element(Visibility):
             listener = EventListener(
                 element_id=self.id,
                 type=type,
-                args=[args] if args and isinstance(args[0], str) else args,
+                args=[args] if args and isinstance(args[0], str) else args,  # type: ignore
                 handler=handler,
                 throttle=throttle,
                 leading_events=leading_events,

+ 2 - 2
nicegui/event_listener.py

@@ -1,6 +1,6 @@
 import uuid
 from dataclasses import dataclass, field
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, Optional, Sequence
 
 from fastapi import Request
 
@@ -12,7 +12,7 @@ class EventListener:
     id: str = field(init=False)
     element_id: int
     type: str
-    args: List[Optional[List[str]]]
+    args: Sequence[Optional[Sequence[str]]]
     handler: Callable
     throttle: float
     leading_events: bool

+ 1 - 1
nicegui/page.py

@@ -107,7 +107,7 @@ class page:
         if 'request' not in {p.name for p in parameters}:
             request = inspect.Parameter('request', inspect.Parameter.POSITIONAL_OR_KEYWORD, annotation=Request)
             parameters.insert(0, request)
-        decorated.__signature__ = inspect.Signature(parameters)
+        decorated.__signature__ = inspect.Signature(parameters)  # type: ignore
 
         if 'include_in_schema' not in self.kwargs:
             self.kwargs['include_in_schema'] = globals.endpoint_documentation in {'page', 'all'}