Make codebase work with basic mypy usage

apps/blueman-assistant.in

@@ -4,7 +4,7 @@ import os
 import sys
 import signal
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 
 import gi
 gi.require_version("Gtk", "3.0")

blueman/Constants.py.in

@@ -18,11 +18,9 @@ RFCOMM_WATCHER_PATH = "@LIBEXECDIR@/blueman-rfcomm-watcher"
 
 import os
 import gettext
-import builtins
 
 translation = gettext.translation(GETTEXT_PACKAGE, LOCALEDIR, fallback=True)
 translation.install()
-builtins.ngettext = translation.ngettext
 
 if 'BLUEMAN_SOURCE' in os.environ:
     _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))

blueman/DeviceClass.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from gettext import gettext as _
 import logging
 
 service_cls = [

blueman/Sdp.py

@@ -1,14 +1,12 @@
 # coding=utf-8
 import gettext
+from gettext import gettext as _
 from uuid import UUID
 
 from blueman.Constants import GETTEXT_PACKAGE, LOCALEDIR
 
 translation = gettext.translation(GETTEXT_PACKAGE, LOCALEDIR, fallback=True)
-try:
-    translation.install(unicode=True)
-except TypeError:
-    translation.install()
+translation.install()
 
 # https://www.bluetooth.com/specifications/assigned-numbers/service-discovery
 # http://git.kernel.org/cgit/bluetooth/bluez.git/tree/lib/sdp.h

blueman/Service.py

@@ -3,11 +3,11 @@
 
 
 class Service(object):
-    __group__ = None
-    __svclass_id__ = None
+    __group__: str
+    __svclass_id__: int
     __description__ = None
-    __icon__ = None
-    __priority__ = None
+    __icon__: str
+    __priority__: int
 
     def __init__(self, device, uuid):
         self.__device = device

blueman/bluez/Base.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from typing import Dict, Tuple
+
 from gi.repository import Gio, GLib, GObject
 from gi.types import GObjectMeta
 from blueman.bluez.errors import parse_dbus_error
@@ -47,7 +49,7 @@ class Base(Gio.DBusProxy, metaclass=BaseMeta):
     __name = 'org.bluez'
     __bus_type = Gio.BusType.SYSTEM
 
-    __gsignals__ = {
+    __gsignals__: Dict[str, Tuple[GObject.SignalFlags, None, Tuple]] = {
         'property-changed': (GObject.SignalFlags.NO_HOOKS, None,
                              (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT))
     }

blueman/gui/DeviceSelectorDialog.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.gui.DeviceSelectorWidget import DeviceSelectorWidget
 
 import gi

blueman/gui/GsmSettings.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 
 from blueman.main.Config import Config
 from blueman.Constants import *

blueman/gui/applet/PluginDialog.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 import weakref
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 
 from blueman.Constants import *
 from blueman.gui.GenericList import GenericList

blueman/gui/manager/ManagerDeviceMenu.py

@@ -1,7 +1,9 @@
 # coding=utf-8
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 from operator import itemgetter
+from typing import Dict, List
+
 from blueman.Constants import UI_PATH
 from blueman.Functions import create_menuitem, e_
 from blueman.bluez.Network import AnyNetwork
@@ -27,8 +29,8 @@
 
 
 class ManagerDeviceMenu(Gtk.Menu):
-    __ops__ = {}
-    __instances__ = []
+    __ops__: Dict[str, str] = {}
+    __instances__: List["ManagerDeviceMenu"] = []
 
     def __init__(self, blueman):
         super().__init__()

blueman/gui/manager/ManagerMenu.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from gettext import gettext as _
 import logging
 
 import blueman.bluez as bluez

blueman/gui/manager/ManagerProgressbar.py

@@ -1,5 +1,7 @@
 # coding=utf-8
+from gettext import gettext as _
 import logging
+from typing import List
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -15,7 +17,7 @@ class ManagerProgressbar(GObject.GObject):
     __gsignals__ = {
         'cancelled': (GObject.SignalFlags.RUN_LAST, None, ()),
     }
-    __instances__ = []
+    __instances__: List["ManagerProgressbar"] = []
 
     def __init__(self, blueman, cancellable=True, text=_("Connecting")):
         super().__init__()

blueman/main/DBusProxies.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from gi.repository import Gio, GLib
+from gi.repository import Gio, GLib  # type: ignore
 from gi.types import GObjectMeta
 
 

blueman/main/DhcpClient.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from typing import List
+
 from gi.repository import GObject
 from gi.repository import GLib
 import socket
@@ -20,7 +22,7 @@ class DhcpClient(GObject.GObject):
         ["udhcpc", "-t", "20", "-x", "hostname", socket.gethostname(), "-n", "-i"]
     ]
 
-    quering = []
+    quering: List[str] = []
 
     def __init__(self, interface, timeout=30):
         super().__init__()

blueman/main/Manager.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 
 import blueman.bluez as bluez
 from blueman.Functions import *

blueman/main/NetworkManager.py

@@ -16,7 +16,7 @@ class NMConnectionError(Exception):
 
 
 class NMConnectionBase(object):
-    conntype = None
+    conntype: str
 
     def __init__(self, service, reply_handler=None, error_handler=None):
         if self.conntype not in ('dun', 'panu'):

blueman/main/PluginManager.py

@@ -1,6 +1,5 @@
 # coding=utf-8
 import os
-import builtins
 import logging
 import traceback
 import importlib
@@ -19,9 +18,6 @@ class LoadException(Exception):
     pass
 
 
-builtins.StopException = StopException
-
-
 class PluginManager(GObject.GObject):
     __gsignals__ = {
         'plugin-loaded': (GObject.SignalFlags.NO_HOOKS, None, (GObject.TYPE_STRING,)),

blueman/main/Sendto.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 import time
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
 from gettext import ngettext
 
 import gi

blueman/main/applet/BluezAgent.py

@@ -1,7 +1,8 @@
 # coding=utf-8
 import os.path
 import logging
-from locale import bind_textdomain_codeset
+from gettext import bind_textdomain_codeset
+from gettext import gettext as _
 from html import escape
 import random
 from xml.etree import ElementTree

blueman/plugins/BasePlugin.py

@@ -1,29 +1,48 @@
 # coding=utf-8
 import logging
 import weakref
+from typing import List, TYPE_CHECKING, Type, Dict, Tuple, Any
+
 from blueman.main.Config import Config
 
 
 class MethodAlreadyExists(Exception):
     pass
 
 
+if TYPE_CHECKING:
+    from mypy_extensions import TypedDict
+
+    class OptionBase(TypedDict):
+        type: Type
+        default: Any
+
+    class Option(OptionBase, total=False):
+        name: str
+        desc: str
+        range: Tuple[int, int]
+
+    class GSettings(TypedDict):
+        schema: str
+        path: None
+
+
 class BasePlugin(object):
-    __depends__ = []
-    __conflicts__ = []
+    __depends__: List[str] = []
+    __conflicts__: List[str] = []
     __priority__ = 0
 
-    __description__ = None
-    __author__ = None
+    __description__: str
+    __author__: str
 
     __unloadable__ = True
     __autoload__ = True
 
     __instance__ = None
 
-    __gsettings__ = None
+    __gsettings__: "GSettings"
 
-    __options__ = {}
+    __options__: Dict[str, "Option"] = {}
 
     def __init__(self, parent):
         self.parent = parent

blueman/plugins/ServicePlugin.py

@@ -1,9 +1,10 @@
 # coding=utf-8
+from typing import List, Tuple
 
 
 class ServicePlugin(object):
-    instances = []
-    __plugin_info__ = None
+    instances: List["ServicePlugin"] = []
+    __plugin_info__: Tuple[str, str]
 
     def __init__(self, parent):
         ServicePlugin.instances.append(self)

blueman/plugins/applet/AppIndicator.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.plugins.AppletPlugin import AppletPlugin
 
 # Check if Appindicator is available and raise ImportError

blueman/plugins/applet/AuthAgent.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.plugins.AppletPlugin import AppletPlugin
 from blueman.main.applet.BluezAgent import BluezAgent
 

blueman/plugins/applet/DBusService.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.main.PluginManager import StopException
 from blueman.plugins.AppletPlugin import AppletPlugin
 from blueman.bluez.Device import Device

blueman/plugins/applet/DhcpClient.py

@@ -1,6 +1,8 @@
 # coding=utf-8
 
+from gettext import gettext as _
 import logging
+
 from blueman.bluez.Network import AnyNetwork
 from blueman.gui.Notification import Notification
 from blueman.plugins.AppletPlugin import AppletPlugin

blueman/plugins/applet/DiscvManager.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.bluez.errors import DBusNoSuchAdapterError
 from blueman.plugins.AppletPlugin import AppletPlugin
 from gi.repository import GLib

blueman/plugins/applet/ExitItem.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk

blueman/plugins/applet/GameControllerWakelock.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from gettext import gettext as _
 import logging
 
 import blueman.bluez as bluez

blueman/plugins/applet/KillSwitch.py

@@ -1,6 +1,9 @@
 # coding=utf-8
+from gettext import gettext as _
 import os
 import weakref
+from typing import Dict
+
 from gi.repository import GLib, Gio
 import struct
 import logging
@@ -47,7 +50,7 @@ class KillSwitch(AppletPlugin):
         "checked": {"type": bool, "default": False}
     }
 
-    _switches = {}
+    _switches: Dict[int, Switch] = {}
     _iom = None
     _fd = None
     _enabled = True

blueman/plugins/applet/Menu.py

@@ -1,5 +1,7 @@
 # coding=utf-8
 
+from gettext import gettext as _
+
 from gi.repository import GLib
 
 from blueman.plugins.AppletPlugin import AppletPlugin

blueman/plugins/applet/NMDUNSupport.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.plugins.AppletPlugin import AppletPlugin
 from blueman.main.NetworkManager import NMDUNConnection
 from blueman.Sdp import DIALUP_NET_SVCLASS_ID

blueman/plugins/applet/NMPANSupport.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from gettext import gettext as _
+
 from blueman.plugins.AppletPlugin import AppletPlugin
 from blueman.main.NetworkManager import NMPANConnection