GitLab

at 2022-12-19T16:25:33+01:00

cq: Use pyright specific ignore code

ci: Update ruff config

         # Fallback to Pillow

         input_file = BytesIO(data)

         image = Image.open(BytesIO(data)).convert('RGBA')

-        array = GLib.Bytes.new(image.tobytes())  # type: ignore

+        array = GLib.Bytes.new(image.tobytes())  # pyright: ignore

         width, height = image.size

         pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(array,

                                                  GdkPixbuf.Colorspace.RGB,

     def _namedtuple_factory(cursor: sqlite3.Cursor,

                             row: tuple[Any, ...]) -> NamedTuple:

         fields = [col[0] for col in cursor.description]

-        return namedtuple('Row', fields)(*row)  # type: ignore

+        return namedtuple('Row', fields)(*row)  # pyright: ignore

 

     def _connect_database(self) -> None:

         path = configpaths.get('SETTINGS')

 

         assert cursor.description is not None

         fields = [col[0] for col in cursor.description]

-        Row = namedtuple('Row', fields)  # type: ignore

+        Row = namedtuple('Row', fields)  # pyright: ignore

         named_row = Row(*row)

         if 'additional_data' in fields:

             _dict = json.loads(named_row.additional_data or '{}')

 

 

 def _convert_disco_info(disco_info: bytes) -> DiscoInfo:

-    return parse_disco_info(Iq(node=disco_info))  # type: ignore

+    return parse_disco_info(Iq(node=disco_info))  # pyright: ignore

 

 

 def _adapt_disco_info(disco_info: DiscoInfo) -> str:

 class Encoder(json.JSONEncoder):

     def default(self, o: Any) -> Any:

         if isinstance(o, set):

-            return list(o)  # type: ignore

+            return list(o)  # pyright: ignore

 

         if isinstance(o, JID):

             return {'__type': 'JID', 'value': str(o)}

 class UnreadTableRow(NamedTuple):

     account: str

     jid: JID

-    count: int  # type: ignore

+    count: int  # pyright: ignore

     message_id: str

     timestamp: float

 

 

         assert cursor.description is not None

         fields = [col[0] for col in cursor.description]

-        Row = namedtuple('Row', fields)  # type: ignore

+        Row = namedtuple('Row', fields)  # pyright: ignore

         return Row(*row)

 

     def _migrate(self) -> None:

         disco_info = self._disco_info_cache.get(jid)

         if disco_info is not None:

             max_timestamp = time.time() - max_age if max_age else 0

-            if max_timestamp > disco_info.timestamp:  # type: ignore

+            if max_timestamp > disco_info.timestamp:  # pyright: ignore

                 return None

         return disco_info

 

 

         assert cursor.description is not None

         fields = [col[0] for col in cursor.description]

-        Row = namedtuple('Row', fields)  # type: ignore

+        Row = namedtuple('Row', fields)  # pyright: ignore

         return Row(*row)

 

     def _migrate(self) -> None:

                            res: Gio.AsyncResult) -> None:

             try:

                 proxy = Gio.DBusProxy.new_finish(res)

-                self._caps = proxy.GetCapabilities()  # type: ignore

+                self._caps = proxy.GetCapabilities()  # pyright: ignore

             except GLib.Error as error:

                 log.warning('Notifications D-Bus not available: %s', error)

             else:

         background = (0, 0, 0)  # RGB (0, 0, 0) black

     else:

         background = (1, 1, 1)  # RGB (255, 255, 255) white

-    return nbxmpp.util.text_to_color(text, background)  # type: ignore

+    return nbxmpp.util.text_to_color(text, background)  # pyright: ignore

 

 

 def get_contact_color(contact: types.ChatContactT

                     'convert avatar image using pillow')

         try:

             avatar = Image.open(BytesIO(file_data)).convert('RGBA')

-            array = GLib.Bytes.new(avatar.tobytes())  # type: ignore

+            array = GLib.Bytes.new(avatar.tobytes())  # pyright: ignore

             width, height = avatar.size

             pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(

                 array, GdkPixbuf.Colorspace.RGB,

             log.debug('Error', exc_info=True)

             return None

 

-        array = GLib.Bytes.new(avatar.tobytes())  # type: ignore

+        array = GLib.Bytes.new(avatar.tobytes())  # pyright: ignore

         width, height = avatar.size

         pixbuf = GdkPixbuf.Pixbuf.new_from_bytes(

             array, GdkPixbuf.Colorspace.RGB, True,

     windows: list[Gtk.Window] = []

     for win in app.app.get_windows():

         if hasattr(win, 'account'):

-            if win.account == account:  # type: ignore

+            if win.account == account:  # pyright: ignore

                 windows.append(win)

     return windows

 

             continue

 

         if account is not None:

-            if account != win.account:  # type: ignore

+            if account != win.account:  # pyright: ignore

                 continue

 

         if jid is not None:

-            if jid != win.jid:  # type: ignore

+            if jid != win.jid:  # pyright: ignore

                 continue

         return win

     return None

 class EventHelper(CommonEventHelper):

     def __init__(self):

         CommonEventHelper.__init__(self)

-        self.connect('destroy', self.__on_destroy)  # type: ignore

+        self.connect('destroy', self.__on_destroy)  # pyright: ignore

 

     def __on_destroy(self, *args: Any) -> None:

         self.unregister_events()

   "C901",   # mccabe

   # "D",    # pydocstyle

   "E",      # pycodestyle

+  # "EM",     # flake8-errmsg

   # "ERA",    # eradicate

   "F",      # pyflakes  

   # "FBT",    # flake8-boolean-trap

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

9 changed files:

Changes: