Add stubs/gi

blueman/bluez/Base.py

@@ -62,7 +62,7 @@ def do_g_properties_changed(self, changed_properties: GLib.Variant, _invalidated
     def _call(
         self,
         method: str,
-        param: GLib.Variant = None,
+        param: Optional[GLib.Variant] = None,
         reply_handler: Optional[Callable[..., None]] = None,
         error_handler: Optional[Callable[[BluezDBusException], None]] = None,
     ) -> None:

blueman/gui/Animation.py

@@ -1,4 +1,4 @@
-from typing import Iterable
+from typing import Iterable, Optional
 
 from gi import require_version
 require_version("Gtk", "3.0")
@@ -8,10 +8,10 @@
 class Animation:
     def __init__(self, icon: Gtk.Image, icons: Iterable[str], rate: int = 1) -> None:
         self.icon_names = list(icons)
-        self.timer = None
+        self.timer: Optional[int] = None
         self.current = 0
         self.icon = icon
-        self.rate = 1000 / rate
+        self.rate = int(1000 / rate)
 
     def status(self) -> bool:
         if self.timer:
@@ -20,8 +20,8 @@ def status(self) -> bool:
             return False
 
     def set_rate(self, rate: float) -> None:
-        if not self.rate == (1000 / rate):
-            self.rate = 1000 / rate
+        if not self.rate == int(1000 / rate):
+            self.rate = int(1000 / rate)
             self.stop()
             self.start()
 

blueman/gui/GtkAnimation.py

@@ -20,7 +20,7 @@ class AnimBase(GObject.GObject):
 
     def __init__(self, state: float = 1.0) -> None:
         super().__init__()
-        self._source = None
+        self._source: Optional[int] = None
         self._state = state
         self.frozen = False
         self.fps = 24.0

blueman/gui/manager/ManagerMenu.py

@@ -218,7 +218,11 @@ def on_device_selected(self, _lst: ManagerDeviceList, device: Device, tree_iter:
                 self.device_menu = ManagerDeviceMenu(self.blueman)
                 self.item_device.set_submenu(self.device_menu)
             else:
-                GLib.idle_add(self.device_menu.generate, priority=GLib.PRIORITY_LOW)
+                def idle() -> bool:
+                    assert self.device_menu is not None  # https://github.com/python/mypy/issues/2608
+                    self.device_menu.generate()
+                    return False
+                GLib.idle_add(idle, priority=GLib.PRIORITY_LOW)
 
         else:
             self.item_device.props.sensitive = False

blueman/gui/manager/ManagerProgressbar.py

@@ -166,7 +166,7 @@ def pulse() -> bool:
 
         if not self.pulsing:
             self.pulsing = True
-            GLib.timeout_add(1000 / 24, pulse)
+            GLib.timeout_add(41, pulse)
 
     def stop(self) -> None:
         self.pulsing = False

blueman/main/PPPConnection.py

@@ -5,7 +5,7 @@
 import subprocess
 import termios
 import tty
-from typing import Any, List, Iterable, Callable, Optional, Tuple, Union, MutableSequence
+from typing import Any, List, Iterable, Callable, Optional, Tuple, Union, MutableSequence, IO
 
 from gi.repository import GObject
 from gi.repository import GLib
@@ -57,7 +57,7 @@ def __init__(self, port: str, number: str = "*99#", apn: str = "", user: str = "
         self.user = user
         self.pwd = pwd
         self.port = port
-        self.interface = None
+        self.interface: Optional[str] = None
 
         self.commands: MutableSequence[Union[str, Tuple[str, Callable[[List[str]], None], Iterable[str]]]] = [
             "ATZ E0 V1 X4 &C1 +FCLASS=0",
@@ -81,6 +81,7 @@ def connect_callback(self, response: List[str]) -> None:
             self.pppd = subprocess.Popen(
                 ["/usr/sbin/pppd", f"{self.port}", "115200", "defaultroute", "updetach", "usepeerdns"], bufsize=1,
                 stdout=subprocess.PIPE)
+            assert self.pppd.stdout is not None
             GLib.io_add_watch(self.pppd.stdout, GLib.IO_IN | GLib.IO_ERR | GLib.IO_HUP, self.on_pppd_stdout)
             GLib.timeout_add(1000, self.check_pppd)
 
@@ -140,14 +141,14 @@ def connect_rfcomm(self) -> None:
 
         self.send_commands()
 
-    def on_pppd_stdout(self, source: GLib.IOChannel, cond: GLib.IOCondition) -> bool:
+    def on_pppd_stdout(self, source: IO[bytes], cond: GLib.IOCondition) -> bool:
         if cond & GLib.IO_ERR or cond & GLib.IO_HUP:
             return False
 
         line = source.readline().decode('utf-8')
         m = re.match(r'Using interface (ppp[0-9]*)', line)
         if m:
-            self.interface = m.groups(1)[0]
+            self.interface = m.groups()[0]
 
         logging.info(line)
 
@@ -176,7 +177,7 @@ def send_command(self, command: str) -> None:
         os.write(self.file, out.encode("UTF-8"))
         termios.tcdrain(self.file)
 
-    def on_data_ready(self, _source: GLib.IOChannel, condition: GLib.IOCondition, command_id: int) -> bool:
+    def on_data_ready(self, _source: int, condition: GLib.IOCondition, command_id: int) -> bool:
         if condition & GLib.IO_ERR or condition & GLib.IO_HUP:
             GLib.source_remove(self.timeout)
             self.__cmd_response_cb(None, PPPException("Socket error"), command_id)

blueman/plugins/applet/DBusService.py

@@ -26,7 +26,7 @@ def on_rfcomm_disconnect(self, port: int) -> None:
 
 class RFCOMMConnectHandler:
     def rfcomm_connect_handler(self, service: SerialService, reply: Callable[[str], None],
-                               err: Callable[[Exception], None]) -> bool:
+                               err: Callable[[Union[RFCOMMError, GLib.Error]], None]) -> bool:
         ...
 
 

blueman/plugins/applet/DiscvManager.py

@@ -38,7 +38,7 @@ def on_load(self) -> None:
         self.adapter = None
         self.time_left = -1
 
-        self.timeout = None
+        self.timeout: Optional[int] = None
 
     def on_unload(self) -> None:
         self.parent.Plugins.Menu.unregister(self)

blueman/plugins/applet/StatusIcon.py

@@ -67,6 +67,7 @@ def query_visibility(self, delay_hiding: bool = False, emit: bool = True) -> Non
                 self.set_visible(False, emit)
 
     def on_visibility_timeout(self) -> bool:
+        assert self.visibility_timeout is not None
         GLib.source_remove(self.visibility_timeout)
         self.visibility_timeout = None
         self.query_visibility()