Commits April 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] fix: AddContact: Don't set name twice for type gateway
by Daniel Brötzmann (＠wurstsalat) 23 Apr '22

23 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bedd7dc2 by wurstsalat at 2022-04-23T08:53:14+02:00 fix: AddContact: Don't set name twice for type gateway - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -120,8 +120,7 @@ def _on_button_clicked(self, client.get_module('Presence').subscribe( self._result.jid, name=self._result.gateway_name, - auto_auth=True, - name=self._nick) + auto_auth=True) app.window.show_account_page(account) self.destroy() return @@ -427,7 +426,7 @@ def prepare(self, account: str, result: DiscoInfo) -> None: icon_name = 'gajim-agent-irc' self._ui.gateway_image.set_from_icon_name( icon_name, Gtk.IconSize.DIALOG) - gateway_name = result.gateway_name or self._result.jid + gateway_name = result.gateway_name or str(self._result.jid) if not result.gateway_type: self._ui.gateway_label.set_text(gateway_name) else: @@ -439,11 +438,11 @@ def prepare(self, account: str, result: DiscoInfo) -> None: for identity in result.identities: if identity.type == 'sms': icon_name = 'gajim-agent-sms' - identity_name = identity.name or self._result.jid + identity_name = identity.name or str(self._result.jid) identity_type = identity.type if identity.type == 'irc': icon_name = 'gajim-agent-irc' - identity_name = identity.name or self._result.jid + identity_name = identity.name or str(self._result.jid) identity_type = identity.type self._ui.gateway_image.set_from_icon_name( icon_name, Gtk.IconSize.DIALOG) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bedd7dc2f0a3560b274f50c90dc42107… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bedd7dc2f0a3560b274f50c90dc42107… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AddContact: Use nick if available
by Daniel Brötzmann (＠wurstsalat) 22 Apr '22

22 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b8dff9a0 by wurstsalat at 2022-04-23T00:04:22+02:00 fix: AddContact: Use nick if available - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -114,12 +114,14 @@ def _on_button_clicked(self, self._result.jid, msg=data['message'], groups=data['groups'], - auto_auth=data['auto_auth']) + auto_auth=data['auto_auth'], + name=self._nick) else: client.get_module('Presence').subscribe( self._result.jid, name=self._result.gateway_name, - auto_auth=True) + auto_auth=True, + name=self._nick) app.window.show_account_page(account) self.destroy() return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8dff9a0e736158a96707e0d47f33193… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8dff9a0e736158a96707e0d47f33193… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Limit mime types for preview_allow_all_images
by Daniel Brötzmann (＠wurstsalat) 22 Apr '22

22 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 743e7593 by wurstsalat at 2022-04-22T20:50:53+02:00 fix: Preview: Limit mime types for preview_allow_all_images - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -216,6 +216,10 @@ def _accept_uri(urlparts: ParseResult, # http/https if urlparts.scheme in ('https', 'http'): if app.settings.get('preview_allow_all_images'): + mime_type = guess_mime_type(uri) + if (mime_type not in MIME_TYPES or + mime_type == 'application/octet-stream'): + return False return True if oob_url is None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/743e7593b8baf4af5a2f62b6588658ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/743e7593b8baf4af5a2f62b6588658ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update Translations
by Philipp Hörist (＠lovetox) 19 Apr '22

19 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6587e490 by Weblate at 2022-04-19T20:36:04+02:00 chore: Update Translations Co-authored-by: Tommy He <lovenemesis(a)gmail.com> Co-authored-by: Weblate <noreply(a)weblate.org> - - - - - 9 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6587e4907304af195c691d74c449bca7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6587e4907304af195c691d74c449bca7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Move translation update into own module
by Philipp Hörist (＠lovetox) 19 Apr '22

19 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94577303 by lovetox at 2022-04-19T18:28:16+02:00 refactor: Move translation update into own module The server needs to run the script and it has only python 3.7 available - - - - - 2 changed files: - + scripts/update_translations.py - setup.py Changes: ===================================== scripts/update_translations.py ===================================== @@ -0,0 +1,85 @@ +# File needs to stay compatible to Python 3.7 +# because its run on the Gajim webserver + + +import re +import subprocess +from pathlib import Path + + +TRANS_DIR = Path('po') +TRANS_TEMPLATE = TRANS_DIR / 'gajim.pot' +REPO_DIR = Path(__file__).resolve().parent.parent + + +TRANSLATABLE_FILES = [ + 'gajim/**/*.py', + 'gajim/**/*.ui', + 'data/org.gajim.Gajim.desktop.in', + 'data/org.gajim.Gajim.appdata.xml.in', +] + + +def template_is_equal(old_template_path: Path, new_template: str) -> bool: + with open(old_template_path, 'r') as f: + old_template = f.read() + + pattern = r'"POT-Creation-Date: .*\n"' + + old_template = re.sub(pattern, '', old_template, count=1) + new_template = re.sub(pattern, '', new_template, count=1) + + return old_template == new_template + + +def update_translation_template() -> bool: + paths: list[Path] = [] + for file_path in TRANSLATABLE_FILES: + paths += list(REPO_DIR.rglob(file_path)) + + cmd = [ + 'xgettext', + '-o', '-', + '-c#', + '--from-code=utf-8', + '--keyword=Q_', + '--no-location', + '--sort-output', + '--package-name=Gajim' + ] + + for path in paths: + cmd.append(str(path)) + + result = subprocess.run(cmd, + cwd=REPO_DIR, + text=True, + check=True, + capture_output=True) + + template = result.stdout + + if (TRANS_TEMPLATE.exists() and + template_is_equal(TRANS_TEMPLATE, template)): + # No new strings were discovered + return False + + with open(TRANS_TEMPLATE, 'w') as f: + f.write(template) + return True + + +def update_translation_files() -> None: + for file in TRANS_DIR.glob('*.po'): + subprocess.run(['msgmerge', + '-U', + '--sort-output', + str(file), + TRANS_TEMPLATE], + cwd=REPO_DIR, + check=True) + + +if __name__ == '__main__': + update_translation_template() + update_translation_files() ===================================== setup.py ===================================== @@ -8,12 +8,10 @@ if sys.version_info < (3, 9): sys.exit('Gajim needs Python 3.9+') -import re import subprocess from pathlib import Path from setuptools import setup -from setuptools import Command from setuptools.command.build_py import build_py as _build from setuptools.command.install import install as _install @@ -25,12 +23,7 @@ META_FILES = [ ('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml')] -TRANSLATABLE_FILES = [ - 'gajim/**/*.py', - 'gajim/**/*.ui', - 'data/org.gajim.Gajim.desktop.in', - 'data/org.gajim.Gajim.appdata.xml.in', -] + TRANS_DIR = Path('po') TRANS_TEMPLATE = TRANS_DIR / 'gajim.pot' @@ -53,66 +46,6 @@ def newer(source: Path, target: Path) -> bool: return mtime1 > mtime2 -def template_is_equal(old_template_path: Path, new_template: str) -> bool: - with open(old_template_path, 'r') as f: - old_template = f.read() - - pattern = r'"POT-Creation-Date: .*\n"' - - old_template = re.sub(pattern, '', old_template, count=1) - new_template = re.sub(pattern, '', new_template, count=1) - - return old_template == new_template - - -def update_translation_template() -> bool: - paths: list[Path] = [] - for file_path in TRANSLATABLE_FILES: - paths += list(REPO_DIR.rglob(file_path)) - - cmd = [ - 'xgettext', - '-o', '-', - '-c#', - '--from-code=utf-8', - '--keyword=Q_', - '--no-location', - '--sort-output', - '--package-name=Gajim' - ] - - for path in paths: - cmd.append(str(path)) - - result = subprocess.run(cmd, - cwd=REPO_DIR, - text=True, - check=True, - capture_output=True) - - template = result.stdout - - if (TRANS_TEMPLATE.exists() and - template_is_equal(TRANS_TEMPLATE, template)): - # No new strings were discovered - return False - - with open(TRANS_TEMPLATE, 'w') as f: - f.write(template) - return True - - -def update_translation_files() -> None: - for file in TRANS_DIR.glob('*.po'): - subprocess.run(['msgmerge', - '-U', - '--sort-output', - str(file), - TRANS_TEMPLATE], - cwd=REPO_DIR, - check=True) - - def build_translation() -> None: for lang in ALL_LINGUAS: po_file = TRANS_DIR / f'{lang}.po' @@ -229,21 +162,6 @@ def run(self): _install.run(self) -class update_translations(Command): - description = "Update translation" - user_options = [] - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - update_translation_template() - update_translation_files() - - # only install subdirectories of data data_files_app_icon = [ ("share/icons/hicolor/scalable/apps", @@ -258,7 +176,6 @@ def run(self): cmdclass={ 'build_py': build, 'install': install, - 'update_translations': update_translations, }, entry_points={ 'console_scripts': [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/945773037577c6eaf64c1075676e6dd1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/945773037577c6eaf64c1075676e6dd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: openpgp: Make nicer fallback string
by Philipp Hörist (＠lovetox) 18 Apr '22

18 Apr '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: da624496 by lovetox at 2022-04-18T14:14:50+02:00 fix: openpgp: Make nicer fallback string - - - - - 1 changed file: - nbxmpp/modules/openpgp.py Changes: ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -345,8 +345,7 @@ def create_message_stanza(stanza, encrypted_payload, with_fallback_text): stanza.addChild(node=eme_node) if with_fallback_text: - stanza.setBody( - '[This message is *encrypted* with OpenPGP (See :XEP:`0373`]') + stanza.setBody('This message is *encrypted* with OpenPGP') def _make_keylist(keylist): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/da6244965e125b517421cda4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/da6244965e125b517421cda4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add gajim.pot
by Philipp Hörist (＠lovetox) 17 Apr '22

17 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4d98a23 by lovetox at 2022-04-17T22:15:23+02:00 chore: Add gajim.pot - - - - - 1 changed file: - .gitignore The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d98a23af45e927e1d305a67c672edf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4d98a23af45e927e1d305a67c672edf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: WinLauncher: Add type annotations
by Philipp Hörist (＠lovetox) 17 Apr '22

17 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5f601d98 by lovetox at 2022-04-17T15:52:54+02:00 chore: WinLauncher: Add type annotations - - - - - 03ce16a5 by lovetox at 2022-04-17T16:16:45+02:00 chore: WinDepCheck: Add type annotations - - - - - cacc141d by lovetox at 2022-04-17T19:20:49+02:00 refactor: Make depcheck more readable - - - - - 3 changed files: - pyrightconfig.json - win/misc/create-launcher.py - win/misc/depcheck.py Changes: ===================================== pyrightconfig.json ===================================== @@ -10,6 +10,7 @@ ".git" ], "include": [ + "win/*", ".ci/*", "gajim/gajim.py", "gajim/common/application.py", ===================================== win/misc/create-launcher.py ===================================== @@ -1,5 +1,5 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- + # Copyright 2016 Christoph Reiter # # This program is free software; you can redistribute it and/or modify @@ -9,7 +9,7 @@ """Creates simple Python .exe launchers for gui and cli apps -./create-launcher.py "3.8.0" <target-dir> +./create-launcher.py "1.4.0" <target-dir> """ import os @@ -19,10 +19,9 @@ import tempfile import shutil import struct -from distutils.spawn import find_executable -def build_resource(rc_path, out_path): +def build_resource(rc_path: str, out_path: str) -> None: """Raises subprocess.CalledProcessError""" def is_64bit(): @@ -34,7 +33,7 @@ def is_64bit(): "-o", out_path]) -def get_build_args(): +def get_build_args() -> list[str]: python_name = os.path.splitext(os.path.basename(sys.executable))[0] python_config = os.path.join( os.path.dirname(sys.executable), python_name + "-config") @@ -49,7 +48,11 @@ def get_build_args(): return shlex.split(cflags) + shlex.split(libs) -def build_exe(source_path, resource_path, is_gui, out_path): +def build_exe(source_path: str, + resource_path: str, + is_gui: bool, + out_path: str) -> None: + args = ["gcc", "-s"] if is_gui: args.append("-mwindows") @@ -58,7 +61,7 @@ def build_exe(source_path, resource_path, is_gui, out_path): subprocess.check_call(args) -def get_launcher_code(debug): +def get_launcher_code(debug: bool) -> str: template = """\ #include "Python.h" #define WIN32_LEAN_AND_MEAN @@ -104,8 +107,13 @@ def get_launcher_code(debug): return template -def get_resouce_code(filename, file_version, file_desc, icon_path, - product_name, product_version, company_name): +def get_resouce_code(filename: str, + file_version: str, + file_desc: str, + icon_path: str, + product_name: str, + product_version: str, + company_name: str) -> str: template = """\ 1 ICON "%(icon_path)s" @@ -135,7 +143,7 @@ def get_resouce_code(filename, file_version, file_desc, icon_path, END """ - def to_ver_list(v): + def to_ver_list(v: str) -> str: v = v.split("-")[0] return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) @@ -152,8 +160,14 @@ def to_ver_list(v): } -def build_launcher(out_path, icon_path, file_desc, product_name, product_version, - company_name, is_gui, debug=False): +def build_launcher(out_path: str, + icon_path: str, + file_desc: str, + product_name: str, + product_version: str, + company_name: str, + is_gui: bool, + debug: bool = False) -> None: src_ico = os.path.abspath(icon_path) target = os.path.abspath(out_path) @@ -179,7 +193,7 @@ def build_launcher(out_path, icon_path, file_desc, product_name, product_version shutil.rmtree(temp) -def main(): +def main() -> None: argv = sys.argv version = argv[1] @@ -203,5 +217,6 @@ def main(): # os.path.join(misc, "gajim.ico"), "History Manager", "History Manager", # version, company_name, 'history_manager.py', True) + if __name__ == "__main__": main() ===================================== win/misc/depcheck.py ===================================== @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Christoph Reiter # # This program is free software; you can redistribute it and/or modify @@ -8,20 +7,20 @@ """ Deletes unneeded DLLs and checks DLL dependencies. -Execute with the build python, will figure out the rest. """ import subprocess import os import sys +from typing import Optional import gi gi.require_version("GIRepository", "2.0") from gi.repository import GIRepository -def get_required_by_typelibs(): - deps = set() +def get_required_by_typelibs() -> set[str]: + deps: set[str] = set() repo = GIRepository.Repository() for tl in os.listdir(repo.get_search_path()[0]): namespace, version = os.path.splitext(tl)[0].split("-", 1) @@ -33,7 +32,8 @@ def get_required_by_typelibs(): EXTENSIONS = [".exe", ".pyd", ".dll"] -SYSTEM_LIBS = ['advapi32.dll', +SYSTEM_LIBS = [ + "advapi32.dll", "cabinet.dll", "comctl32.dll", "comdlg32.dll", "crypt32.dll", "d3d9.dll", "dnsapi.dll", "dsound.dll", "dwmapi.dll", "gdi32.dll", "imm32.dll", "iphlpapi.dll", "kernel32.dll", "ksuser.dll", "msi.dll", "msimg32.dll", @@ -44,8 +44,8 @@ def get_required_by_typelibs(): ] -def get_dependencies(filename): - deps = [] +def get_dependencies(filename: str) -> list[str]: + deps: list[str] = [] try: data = subprocess.getoutput("objdump -p %s" % filename) except Exception as error: @@ -59,7 +59,7 @@ def get_dependencies(filename): return deps -def find_lib(root, name): +def find_lib(root: str, name: str) -> Optional[str]: search_path = os.path.join(root, "bin") if os.path.exists(os.path.join(search_path, name)): return os.path.join(search_path, name) @@ -67,10 +67,10 @@ def find_lib(root, name): return name -def get_things_to_delete(root): - all_libs = set() - needed = set() - for base, dirs, files in os.walk(root): +def get_things_to_delete(root: str) -> list[str]: + all_libs: set[str] = set() + needed: set[str] = set() + for base, _, files in os.walk(root): for f in files: path = os.path.join(base, f) if os.path.splitext(path)[-1].lower() in EXTENSIONS: @@ -78,29 +78,36 @@ def get_things_to_delete(root): for lib in get_dependencies(path): all_libs.add(lib) needed.add(lib) - if not find_lib(root, lib): + if find_lib(root, lib) is None: print("MISSING:", path, lib) for lib in get_required_by_typelibs(): needed.add(lib) - if not find_lib(root, lib): - print("MISSING:", path, lib) + if find_lib(root, lib) is None: + print("MISSING:", lib) - # get rid of things not in the search path, - # maybe loaded through other means? - not_needed = filter( - lambda l: find_lib(root, l) and \ - os.path.splitext(l)[-1].lower() != ".exe", all_libs - needed) + result: list[str] = [] + libs = all_libs - needed + for lib in libs: + _, ext = os.path.splitext(lib) + if ext == ".exe": + continue - return [find_lib(root, l) for l in not_needed] + name = find_lib(root, lib) + if name is None: + continue + result.append(name) -def main(): + return result + + +def main() -> None: libs = get_things_to_delete(sys.prefix) while libs: - for l in libs: - print("DELETE:", l) - os.unlink(l) + for lib in libs: + print("DELETE:", lib) + os.unlink(lib) libs = get_things_to_delete(sys.prefix) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7ce4fcf108ca2c21a44572da99eb67e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7ce4fcf108ca2c21a44572da99eb67e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Don’t depend on deprecated distutil module
by Philipp Hörist (＠lovetox) 16 Apr '22

16 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ce4fcf1 by lovetox at 2022-04-17T00:51:30+02:00 feat: Don’t depend on deprecated distutil module - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== @@ -16,8 +16,6 @@ from setuptools import Command from setuptools.command.build_py import build_py as _build from setuptools.command.install import install as _install -from distutils import log -from distutils.dep_util import newer MAN_FILES = [ @@ -42,6 +40,19 @@ ALL_LINGUAS = sorted([lang.stem for lang in TRANS_DIR.glob('*.po')]) +def newer(source: Path, target: Path) -> bool: + if not source.exists(): + raise ValueError("file '%s' does not exist" % source.resolve()) + if not target.exists(): + return True + + from stat import ST_MTIME + mtime1 = source.stat()[ST_MTIME] + mtime2 = target.stat()[ST_MTIME] + + return mtime1 > mtime2 + + def template_is_equal(old_template_path: Path, new_template: str) -> bool: with open(old_template_path, 'r') as f: old_template = f.read() @@ -110,7 +121,7 @@ def build_translation() -> None: if not (mo_dir.is_dir() or mo_dir.is_symlink()): mo_dir.mkdir(parents=True) - if newer(str(po_file), str(mo_file)): + if newer(po_file, mo_file): subprocess.run(['msgfmt', str(po_file), '-o', @@ -118,7 +129,7 @@ def build_translation() -> None: cwd=REPO_DIR, check=True) - log.info('Compiling %s >> %s', po_file, mo_file) + print('Compiling %s >> %s', po_file, mo_file) def install_trans(data_files) -> None: @@ -150,7 +161,7 @@ def build_man() -> None: with open(filename, 'rb') as f_in,\ gzip.open(man_file_gz, 'wb') as f_out: f_out.writelines(f_in) - log.info('Compiling %s >> %s', filename, man_file_gz) + print('Compiling %s >> %s', filename, man_file_gz) def install_man(data_files) -> None: @@ -196,7 +207,7 @@ def merge(in_file, out_file, option, po_dir: str = 'po') -> None: msg = ('ERROR: %s was not merged into the translation files!\n' % out_file) raise SystemExit(msg) - log.info('Compiling %s >> %s', in_file, out_file) + print('Compiling %s >> %s', in_file, out_file) class build(_build): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ce4fcf108ca2c21a44572da99eb67e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7ce4fcf108ca2c21a44572da99eb67e6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: Bytestream: Add type annotations
by Philipp Hörist (＠lovetox) 16 Apr '22

16 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f3034862 by lovetox at 2022-04-16T15:48:02+02:00 chore: Bytestream: Add type annotations - - - - - e89cb1ab by lovetox at 2022-04-16T15:48:02+02:00 chore: Helpers: Add type annotations - - - - - 26612aa8 by lovetox at 2022-04-16T15:48:02+02:00 fix: Exception: Make sure value is set for sentry payload - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/modules/bytestream.py - gajim/gtk/exception.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -913,10 +913,10 @@ def timeout_wrapper(): return delay_execution_decorator -def event_filter(filter_): - def event_filter_decorator(func): +def event_filter(filter_: Any): + def event_filter_decorator(func: Any) -> Any: @wraps(func) - def func_wrapper(self, event, *args, **kwargs): + def func_wrapper(self, event: Any, *args: Any, **kwargs: Any) -> Any: for attr in filter_: if '=' in attr: attr1, attr2 = attr.split('=') ===================================== gajim/common/modules/bytestream.py ===================================== @@ -43,7 +43,7 @@ log = logging.getLogger('gajim.c.m.bytestream') -def is_transfer_paused(file_props): +def is_transfer_paused(file_props: FilesProp) -> bool: if file_props.stopped: return False if file_props.completed: @@ -52,7 +52,7 @@ def is_transfer_paused(file_props): return False return file_props.paused -def is_transfer_active(file_props): +def is_transfer_active(file_props: FilesProp) -> bool: if file_props.stopped: return False if file_props.completed: @@ -63,7 +63,7 @@ def is_transfer_active(file_props): return True return not file_props.paused -def is_transfer_stopped(file_props): +def is_transfer_stopped(file_props: FilesProp) -> bool: if not file_props: return True if file_props.error: ===================================== gajim/gtk/exception.py ===================================== @@ -229,7 +229,8 @@ def _init_sentry(self, endpoint: str) -> None: default_integrations=False, shutdown_timeout=0, auto_session_tracking=False, - before_send=self._before_send) + before_send=self._before_send, + debug=False) sentry_sdk.set_context('os', { 'name': get_os_name(), @@ -247,6 +248,16 @@ def _capture_exception(self) -> None: sentry_sdk.capture_exception(self._traceback_data) def _before_send(self, event: dict[str, Any], hint: Any) -> dict[str, Any]: + # Make sure the exception value is set, GitLab needs it. + # The value is the arg which is passed to the Exception. + # e.g. raise Exception('Error') + try: + value = event['exception']['values'][0].get('value') + if not value: + event['exception']['values'][0]['value'] = 'Unknown' + except Exception: + pass + # Remove the hostname of the machine event['server_name'] = '' pprint.pprint(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2bbd96644828c43def6c95555f33dfb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2bbd96644828c43def6c95555f33dfb… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2022