Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 14 commits: refactor: Remove unnecessary map() usage
by Philipp Hörist (＠lovetox) 04 Dec '22

04 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fd47095e by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary map() usage - - - - - 6c666114 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary method arguments - - - - - 532e2249 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Use "not in" for inclusion check - - - - - f256b6ec by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary variable assignment before return - - - - - 90cd87a2 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Simplify import - - - - - c4068f05 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Reorder comparison - - - - - 012daf50 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Add noqa for false positive ruff checks - - - - - 53f96919 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: PluginManager: Simplify setting module attribute - - - - - 90a53769 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Rename AppIndicator import - - - - - d14e1ee9 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Follow CapWords convention for classes - - - - - b73700ee by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Assistant: Use dict literal - - - - - 93890f8d by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary method cache This method is not expensive and only called a few times - - - - - 6440fd60 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Update ruff configuration - - - - - 9e9101a7 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Repace pylint/flake8 with ruff - - - - - 28 changed files: - − .ci/pylint.sh - .gitignore - .gitlab-ci.yml - gajim/common/app.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/logging_helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/gtk/adhoc.py - gajim/gtk/assistant.py - gajim/gtk/chat_function_page.py - gajim/gtk/css_config.py - gajim/gtk/dataform.py - gajim/gtk/menus.py - gajim/gtk/message_input.py - gajim/gtk/status_icon.py - gajim/gtk/util.py - gajim/plugins/pluginmanager.py - − pylintrc - pyproject.toml - scripts/pre-push-tests.sh - setup.cfg - setup.py - test/no_gui/test_styling.py Changes: ===================================== .ci/pylint.sh deleted ===================================== @@ -1,24 +0,0 @@ -#!/bin/sh - -# exit when any command fails -set -e - -PYLINT=${PYLINT:-pylint} - -# Ignore but need fixing - -# C0103 invalid-name -# C0415 import-outside-toplevel -# R1710 inconsistent-return-statements -# W0201 attribute-defined-outside-init -# W0221 arguments-differ -# W0233 non-parent-init-called -# W0613 unused-argument - -NEED_FIXING=C0103,C0415,R1710,W0201,W0221,W0233,W0613 - - -"$PYLINT" --version -"$PYLINT" --disable="$NEED_FIXING" --ignore=modules,dbus "$@" -"$PYLINT" --disable="C0415" "$@/common/modules" -"$PYLINT" "$@/common/dbus" ===================================== .gitignore ===================================== @@ -16,6 +16,7 @@ gajim/gui/* __pycache__/ .mypy_cache/ +.ruff_cache/ # Build folders ===================================== .gitlab-ci.yml ===================================== @@ -33,23 +33,14 @@ test-pyright: - $(npm bin)/pyright interruptible: true -test-flake8: +test-ruff: stage: test rules: - changes: - "**/*.py" script: - - flake8 - interruptible: true - -test-pylint: - stage: test - rules: - - changes: - - "**/*.py" - script: - - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git - - .ci/pylint.sh --jobs=2 gajim + - pip3 install ruff + - ruff . interruptible: true test-unittest: ===================================== gajim/common/app.py ===================================== @@ -474,8 +474,7 @@ def get_jid_from_account(account_name: str) -> str: ''' name = settings.get_account_setting(account_name, 'name') hostname = settings.get_account_setting(account_name, 'hostname') - jid = name + '@' + hostname - return jid + return name + '@' + hostname def get_hostname_from_account(account_name: str, use_srv: bool = False) -> str: @@ -502,10 +501,13 @@ def get_priority(account: str, show: str) -> int: prio = settings.get_account_setting(account, 'autopriority_' + show) else: prio = settings.get_account_setting(account, 'priority') + if prio < -128: - prio = -128 - elif prio > 127: - prio = 127 + return -128 + + if prio > 127: + return 127 + return prio ===================================== gajim/common/const.py ===================================== @@ -247,7 +247,7 @@ class MUCJoinedState(Enum): CREATING = 'creating' CAPTCHA_REQUEST = 'captcha in progress' CAPTCHA_FAILED = 'captcha failed' - PASSWORD_REQUEST = 'password request' + PASSWORD_REQUEST = 'password request' # noqa: S105 def __str__(self): return self.name ===================================== gajim/common/helpers.py ===================================== @@ -183,28 +183,28 @@ def get_uf_show(show: str, use_mnemonic: bool = False) -> str: def get_uf_sub(sub: str) -> str: if sub == 'none': - uf_sub = p_('Contact subscription', 'None') - elif sub == 'to': - uf_sub = p_('Contact subscription', 'To') - elif sub == 'from': - uf_sub = p_('Contact subscription', 'From') - elif sub == 'both': - uf_sub = p_('Contact subscription', 'Both') - else: - uf_sub = p_('Contact subscription', 'Unknown') + return p_('Contact subscription', 'None') + + if sub == 'to': + return p_('Contact subscription', 'To') + + if sub == 'from': + return p_('Contact subscription', 'From') - return uf_sub + if sub == 'both': + return p_('Contact subscription', 'Both') + + return p_('Contact subscription', 'Unknown') def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: - uf_ask = p_('Contact subscription', 'None') - elif ask == 'subscribe': - uf_ask = p_('Contact subscription', 'Subscribe') - else: - uf_ask = ask + return p_('Contact subscription', 'None') + + if ask == 'subscribe': + return p_('Contact subscription', 'Subscribe') - return uf_ask + return ask def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: @@ -280,13 +280,7 @@ def get_uf_relative_time(timestamp: float) -> str: def to_one_line(msg: str) -> str: msg = msg.replace('\\', '\\\\') - msg = msg.replace('\n', '\\n') - # s1 = 'test\ntest\\ntest' - # s11 = s1.replace('\\', '\\\\') - # s12 = s11.replace('\n', '\\n') - # s12 - # 'test\\ntest\\\\ntest' - return msg + return msg.replace('\n', '\\n') def from_one_line(msg: str) -> str: @@ -296,13 +290,7 @@ def from_one_line(msg: str) -> str: # So here match '\\n' but not if you have a '\' before that expr = re.compile(r'(?<!\\)\\n') msg = expr.sub('\n', msg) - msg = msg.replace('\\\\', '\\') - # s12 = 'test\\ntest\\\\ntest' - # s13 = re.sub('\n', s12) - # s14 s13.replace('\\\\', '\\') - # s14 - # 'test\ntest\\ntest' - return msg + return msg.replace('\\\\', '\\') def chatstate_to_string(chatstate: Optional[Chatstate]) -> str: @@ -345,8 +333,7 @@ def build_command(executable: str, parameter: str) -> str: # we add to the parameter (can hold path with spaces) # "" so we have good parsing from shell parameter = parameter.replace('"', '\\"') # but first escape " - command = f'{executable} "{parameter}"' - return command + return f'{executable} "{parameter}"' def sanitize_filename(filename: str) -> str: @@ -364,7 +351,7 @@ def sanitize_filename(filename: str) -> str: ] filename = ''.join(char for char in filename if char not in blacklist) - filename = ''.join(char for char in filename if 31 < ord(char)) + filename = ''.join(char for char in filename if ord(char) > 31) filename = unicodedata.normalize('NFKD', filename) filename = filename.rstrip('. ') @@ -565,12 +552,12 @@ def get_auth_sha(sid: str, initiator: str, target: str) -> str: Return sha of sid + initiator + target used for proxy auth ''' return hashlib.sha1( - (f'{sid}{initiator}{target}').encode('utf-8')).hexdigest() + (f'{sid}{initiator}{target}').encode()).hexdigest() def remove_invalid_xml_chars(string_: str) -> str: if string_: - string_ = re.sub(INVALID_XML_CHARS_REGEX, '', string_) + return re.sub(INVALID_XML_CHARS_REGEX, '', string_) return string_ @@ -681,9 +668,8 @@ def jid_is_blocked(account: str, jid: str) -> bool: def get_subscription_request_msg(account: Optional[str] = None) -> str: - message = _('I would like to add you to my contact list.') if account is None: - return message + return _('I would like to add you to my contact list.') message = app.settings.get_account_setting( account, 'subscription_request_msg') @@ -795,10 +781,9 @@ class AdditionalDataDict(collections.UserDict): @staticmethod def _get_path_childs(full_path: str) -> list[str]: - path_childs = [full_path] if ':' in full_path: - path_childs = full_path.split(':') - return path_childs + return full_path.split(':') + return [full_path] def set_value(self, full_path: str, key: str, value: Optional[str]) -> None: path_childs = self._get_path_childs(full_path) @@ -851,7 +836,7 @@ class Singleton(type): def __call__(cls, *args: Any, **kwargs: Any): if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__( + cls._instances[cls] = super().__call__( *args, **kwargs) return cls._instances[cls] @@ -1459,28 +1444,25 @@ def warn_about_plain_connection(account: str, def get_idle_status_message(state: str, status_message: str) -> str: message = app.settings.get(f'auto{state}_message') if not message: - message = status_message - else: - message = message.replace('$S', '%(status)s') - message = message.replace('$T', '%(time)s') - message = message % { - 'status': status_message, - 'time': app.settings.get(f'auto{state}time') - } - return message + return status_message + message = message.replace('$S', '%(status)s') + message = message.replace('$T', '%(time)s') + return message % { + 'status': status_message, + 'time': app.settings.get(f'auto{state}time') + } -def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: - nick = app.nicks[account] +def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: client = app.get_client(account) bookmark = client.get_module('Bookmarks').get_bookmark(room_jid) if bookmark is not None: if bookmark.nick is not None: - nick = bookmark.nick + return bookmark.nick - return nick + return app.nicks[account] def get_random_muc_localpart() -> str: @@ -1528,15 +1510,13 @@ def get_os_version() -> str: def get_gobject_version() -> str: - gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - return gobject_ver + return '.'.join(map(str, GObject.pygobject_version)) def get_glib_version() -> str: - glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, - GLib.MINOR_VERSION, - GLib.MICRO_VERSION])) - return glib_ver + return '.'.join(map(str, [GLib.MAJOR_VERSION, + GLib.MINOR_VERSION, + GLib.MICRO_VERSION])) def make_path_from_jid(base_path: Path, jid: JID) -> Path: ===================================== gajim/common/i18n.py ===================================== @@ -140,9 +140,10 @@ def ngettext(s_sing: str, ''' text = _translation.ngettext(s_sing, s_plural, n) if n == 1 and replace_sing is not None: - text = text % replace_sing - elif n > 1 and replace_plural is not None: - text = text % replace_plural + return text % replace_sing + + if n > 1 and replace_plural is not None: + return text % replace_plural return text ===================================== gajim/common/logging_helpers.py ===================================== @@ -81,7 +81,7 @@ def parseAndSetLogLevels(arg: str) -> None: file=sys.stderr) -class colors: +class Colors: NONE = chr(27) + '[0m' BLACK = chr(27) + '[30m' RED = chr(27) + '[31m' @@ -102,19 +102,19 @@ class colors: def colorize(text: str, color: str) -> str: - return color + text + colors.NONE + return color + text + Colors.NONE class FancyFormatter(logging.Formatter): ''' - An eye-candy formatter with colors + An eye-candy formatter with Colors ''' colors_mapping = { - 'DEBUG': colors.BLUE, - 'INFO': colors.GREEN, - 'WARNING': colors.BROWN, - 'ERROR': colors.RED, - 'CRITICAL': colors.BRIGHT_RED, + 'DEBUG': Colors.BLUE, + 'INFO': Colors.GREEN, + 'WARNING': Colors.BROWN, + 'ERROR': Colors.RED, + 'CRITICAL': Colors.BRIGHT_RED, } def __init__(self, @@ -129,7 +129,7 @@ def formatTime(self, datefmt: Optional[str] = None) -> str: f = logging.Formatter.formatTime(self, record, datefmt) if self.use_color: - f = colorize(f, colors.DARK_GRAY) + f = colorize(f, Colors.DARK_GRAY) return f def format(self, record: logging.LogRecord) -> str: @@ -139,7 +139,7 @@ def format(self, record: logging.LogRecord) -> str: if self.use_color: c = FancyFormatter.colors_mapping.get(level, '') record.levelname = colorize(record.levelname, c) - record.name = '%-25s' % colorize(record.name, colors.CYAN) + record.name = '%-25s' % colorize(record.name, Colors.CYAN) else: record.name = '%-25s|' % record.name ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -21,8 +21,6 @@ from typing import Optional from typing import cast -import functools - from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID from nbxmpp.structs import BookmarkData @@ -153,7 +151,6 @@ def pass_disco(self, info: DiscoInfo) -> None: self._compat = Namespace.BOOKMARKS_COMPAT in info.features self._conversion = Namespace.BOOKMARK_CONVERSION in info.features - @functools.lru_cache(maxsize=1) def _bookmark_module(self) -> str: if not self._con.get_module('PubSub').publish_options: return 'PrivateBookmarks' ===================================== gajim/common/modules/bytestream.py ===================================== @@ -321,7 +321,7 @@ def _add_local_ips_as_streamhosts_to_query(self, my_ips = [my_ip] # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): - if (not addr[4][0] in my_ips and + if (addr[4][0] not in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1'): my_ips.append(addr[4][0]) ===================================== gajim/common/regex.py ===================================== @@ -95,13 +95,13 @@ class PRECIS: IdentifierClass: Any -class PRECIS_IdentifierClass: +class PRECISIdentifierClass: _p = PRECIS Valid = fr'{_p.LetterDigits}\x21-\x7e' Disallowed = fr'{_p.Spaces}{_p.Symbols}{_p.HasCompat}' # there's a ton more -PRECIS.IdentifierClass = PRECIS_IdentifierClass +PRECIS.IdentifierClass = PRECISIdentifierClass # (Rough approximation of) Jabber IDs, as defined in [XMPP: Address Format] ===================================== gajim/common/setting_values.py ===================================== @@ -27,12 +27,12 @@ class _DEFAULT: pass -class _ACCOUNT_DEFAULT: +class _ACCOUNTDEFAULT: pass HAS_APP_DEFAULT = _DEFAULT() -HAS_ACCOUNT_DEFAULT = _ACCOUNT_DEFAULT() +HAS_ACCOUNT_DEFAULT = _ACCOUNTDEFAULT() BoolSettings = Literal[ ===================================== gajim/gtk/adhoc.py ===================================== @@ -329,9 +329,7 @@ def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: self.update_page_complete() def get_visible_buttons(self) -> list[str]: - actions = list(map(lambda action: action.value, - self._last_stage_data.actions)) - return actions + return [action.value for action in self._last_stage_data.actions] def get_default_button(self) -> str: return self._last_stage_data.default.value ===================================== gajim/gtk/assistant.py ===================================== @@ -30,17 +30,17 @@ class Assistant(Gtk.ApplicationWindow, EventHelper): - __gsignals__ = dict( - button_clicked=( + __gsignals__ = { + 'button-clicked': ( GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, None, (str, ) ), - page_changed=( + 'page-changed': ( GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, None, (str, ) - )) + )} def __init__(self, transient_for: Optional[Gtk.Window] = None, ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -44,7 +44,7 @@ class FunctionMode(Enum): CHANGE_NICKNAME = 'change-nickname' KICK = 'kick' BAN = 'ban' - PASSWORD_REQUEST = 'password-request' + PASSWORD_REQUEST = 'password-request' # noqa: S105 CAPTCHA_REQUEST = 'captcha-request' CAPTCHA_ERROR = 'captcha-error' JOIN_FAILED = 'join-failed' ===================================== gajim/gtk/css_config.py ===================================== @@ -169,7 +169,7 @@ def _load_css_from_file(self, ) -> None: path = configpaths.get('STYLE') / filename try: - with open(path, 'r', encoding='utf8') as file_: + with open(path, encoding='utf8') as file_: css = file_.read() except Exception as exc: log.error('Error loading css: %s', exc) ===================================== gajim/gtk/dataform.py ===================================== @@ -516,9 +516,7 @@ def __init__(self, self._store.append( [label, value, label, value in field.values]) - labels_over_max_width = map(lambda x: len(x) > 40, - [option[0] for option in field.options]) - if any(labels_over_max_width): + if any(filter(lambda x: len(x[0]) > 40, field.options)): self.set_tooltip_column(2) self.set_model(self._store) ===================================== gajim/gtk/menus.py ===================================== @@ -671,8 +671,7 @@ def get_chat_row_menu(contact: types.ChatContactT, 'win.retract-message', param)) - menu = GajimMenu.from_list(menu_items) - return menu + return GajimMenu.from_list(menu_items) def get_preview_menu(preview: Preview) -> GajimMenu: ===================================== gajim/gtk/message_input.py ===================================== @@ -225,7 +225,7 @@ def _get_spell_checker_language(self, assert isinstance(lang, str) lang = Gspell.language_lookup(lang) if lang is None: - lang = Gspell.language_get_default() + return Gspell.language_get_default() return lang def _on_language_changed(self, @@ -347,8 +347,7 @@ def has_text(self) -> bool: def get_text(self) -> str: buf = self.get_buffer() start, end = buf.get_bounds() - text = self.get_buffer().get_text(start, end, True) - return text + return self.get_buffer().get_text(start, end, True) def _on_toggle_spell_check(self, *args: Any) -> None: if not app.is_installed('GSPELL'): ===================================== gajim/gtk/status_icon.py ===================================== @@ -46,11 +46,11 @@ if app.is_installed('APPINDICATOR'): # pylint: disable=ungrouped-imports - from gi.repository import AppIndicator3 as appindicator + from gi.repository import AppIndicator3 as AppIndicator elif app.is_installed('AYATANA_APPINDICATOR'): # pylint: disable=ungrouped-imports - from gi.repository import AyatanaAppIndicator3 as appindicator + from gi.repository import AyatanaAppIndicator3 as AppIndicator log = logging.getLogger('gajim.gui.statusicon') @@ -61,7 +61,7 @@ def __init__(self) -> None: if self._can_use_libindicator(): app.settings.connect_signal('show_trayicon', self._on_setting_changed) - self._backend = AppIndicator() + self._backend = AppIndicatorIcon() log.info('Use AppIndicator3 backend') elif app.is_display(Display.WAYLAND): self._backend = NoneBackend() @@ -295,16 +295,16 @@ def _build_menu(self, button: int, event_time: int) -> None: None, None, None, None, button, event_time) -class AppIndicator(GtkMenuBackend): +class AppIndicatorIcon(GtkMenuBackend): def __init__(self) -> None: GtkMenuBackend.__init__(self) - self._status_icon = appindicator.Indicator.new( + self._status_icon = AppIndicator.Indicator.new( 'Gajim', 'org.gajim.Gajim', - appindicator.IndicatorCategory.COMMUNICATIONS) + AppIndicator.IndicatorCategory.COMMUNICATIONS) self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + self._status_icon.set_status(AppIndicator.IndicatorStatus.ACTIVE) self._status_icon.set_menu(self._ui.systray_context_menu) self._status_icon.set_secondary_activate_target( self._ui.toggle_window_menuitem) @@ -313,10 +313,10 @@ def __init__(self) -> None: def update_state(self, init: bool = False) -> None: if not app.settings.get('show_trayicon'): - self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) + self._status_icon.set_status(AppIndicator.IndicatorStatus.PASSIVE) return - self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) + self._status_icon.set_status(AppIndicator.IndicatorStatus.ACTIVE) if not init and app.window.get_total_unread_count(): icon_name = 'dcraven-message-new' @@ -335,7 +335,7 @@ def update_state(self, init: bool = False) -> None: def is_visible(self) -> bool: status = self._status_icon.get_status() - return status == appindicator.IndicatorStatus.ACTIVE + return status == AppIndicator.IndicatorStatus.ACTIVE def shutdown(self) -> None: pass ===================================== gajim/gtk/util.py ===================================== @@ -406,11 +406,10 @@ def format_tune(data: TuneData) -> str: title = GLib.markup_escape_text(data.title or _('Unknown Title')) source = GLib.markup_escape_text(data.source or _('Unknown Source')) - tune_string = _('"%(title)s" by %(artist)s\n' - 'from %(source)s') % {'title': title, - 'artist': artist, - 'source': source} - return tune_string + return _('"%(title)s" by %(artist)s\n' + 'from %(source)s') % {'title': title, + 'artist': artist, + 'source': source} def get_account_tune_icon_name(account: str) -> Optional[str]: @@ -720,11 +719,10 @@ def open_window(name: str, **kwargs: Any) -> Any: def get_gtk_version() -> str: - gtk_ver = '%i.%i.%i' % ( + return '%i.%i.%i' % ( Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version()) - return gtk_ver class EventHelper(CommonEventHelper): ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -268,8 +268,8 @@ def _load_plugin_module(self, for module_attr_name in dir(module): module_attr = getattr(module, module_attr_name) if issubclass(module_attr, GajimPlugin): - setattr(module_attr, 'manifest', manifest) - setattr(module_attr, '__path__', str(manifest.path)) + module_attr.manifest = manifest + module_attr.__path__ = str(manifest.path) return module_attr return None ===================================== pylintrc deleted ===================================== @@ -1,439 +0,0 @@ -[MASTER] - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code -extension-pkg-whitelist= - -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=gui - -# Add files or directories matching the regex patterns to the blacklist. The -# regex matches against base names, not paths. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. -jobs=2 - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - -# Pickle collected data for later comparisons. -persistent=yes - -# Specify a configuration file. -#rcfile= - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then re-enable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -# -# Errors which are covered by pyright -# -# E0401 import-error -# E1101 no-member -# E1102 not-callable -# E1111 assignment-from-no-return -# E1120 no-value-for-parameter -# E1121 too-many-function-args -# E1123 unexpected-keyword-arg -# E1124 redundant-keyword-arg -# E1125 missing-kwoa -# E1126 invalid-sequence-index -# E1127 invalid-slice-index -# E1128 assignment-from-none -# E1129 not-context-manager -# E1130 invalid-unary-operand-type -# E1131 unsupported-binary-operation -# E1132 repeated-keyword -# E1133 not-an-iterable -# E1134 not-a-mapping -# E1135 unsupported-membership-test -# E1136 unsubscriptable-object -# E1137 unsupported-assignment-operation -# E1138 unsupported-delete-operation -# E1139 invalid-metaclass -# E1140 unhashable-dict-key -# E1141 dict-iter-missing-items -# E1142 await-outside-async -# I1101 c-extension-no-member -# W0212 protected-access -# W1113 keyword-arg-before-vararg -# W1114 arguments-out-of-order -# W1115 non-str-assignment-to-dunder-name -# W1116 isinstance-second-argument-not-valid-type -# -# Errors which are covered by flake8 -# -# C0301 line-too-long -# C0303 trailing-whitespace -# C0304 missing-final-newline -# C0321 multiple-statements -# W0301 unnecessary-semicolon -# W0311 bad-indentation -# W0611 unused-import -# -# Ignore Always, we don’t need these checks -# -# C0111 missing-docstring -# C0209 use-f-string -# C0302 too-many-lines -# C0411 wrong-import-order -# C0413 wrong-import-position -# R0801 duplicat-code -# R0904 too-many-public-methods -# R0913 too-many-arguments -# R0915 too-many-statements -# R1725 super-with-arguments -# R1732 consider-using-with -# W0237 arguments-renamed -# W0511 fix-me -# W0707 raise-missing-from -# W1404 implicit-str-concat -# W1406 redundant-u-string-prefix - -disable=E0401,E1101,E1102,E1111,E1120,E1121,E1123,E1124,E1125,E1126,E1127,E1128,E1129,E1130,E1131,E1132,E1133,E1134,E1135,E1136,E1137,E1138,E1139,E1140,E1141,E1142,I1101,W0212,W1113,W1114,W1115,W1116,C0301,C0303,C0304,C0321,C0411,C0413,W0301,W0311,W0611,C0111,C0209,C0302,R0801,R0904,R0913,R0915,R1725,R1732,W0237,W0311,W0511,W0707,W1404,W1406 - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -enable= - - -[REPORTS] - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - -# Set the output format. Available formats are text, parseable, colorized, json -# and msvs (visual studio).You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Tells whether to display a full report or only the messages -reports=no - -# Activate the evaluation score. -score=no - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - - -[VARIABLES] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# Tells whether unused global variables should be treated as a violation. -allow-global-unused-variables=yes - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=(_.*|kwargs|args) - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,future.builtins - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# List of class names for which member attributes should not be checked (useful -# for classes with dynamically set attributes). This supports the use of -# qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib.Error - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis. It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules=gi.repository,cairo,gajim.gui - -# Show a hint with possible names when a member name was not found. The aspect -# of finding the hint is based on edit distance. -missing-member-hint=yes - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=no - -# Minimum lines number of a similarity. -min-similarity-lines=4 - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -expected-line-ending-format= - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )?<?https?://\S+>?$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=80 - -# Maximum number of lines in a module -max-module-lines=3000 - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - - -[BASIC] - -# Regular expression matching correct argument names -argument-rgx=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct attribute names -attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ - -# Regular expression matching correct constant names -const-rgx= - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Regular expression matching correct function names -function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,ex,Run,_,iq - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct method names -method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -property-classes=abc.abstractproperty - -# Regular expression matching correct variable names -variable-rgx=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ - - -[IMPORTS] - -# Analyse import fallback blocks. This can be used to support both Python 2 and -# 3 compatible code, which means that the block might have code that exists -# only in one or another interpreter, leading to false positives when analysed. -analyse-fallback-blocks=no - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=optparse,tkinter.tix - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - -# Force import order to recognize a module as part of the standard -# compatibility libraries. -known-standard-library= - -# Force import order to recognize a module as part of a third party library. -known-third-party=enchant - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=15 - -# Maximum number of attributes for a class (see R0902). -max-attributes=9999 - -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 - -# Maximum number of branch for function / method body -max-branches=50 - -# Maximum number of locals for function / method body -max-locals=50 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=50 - -# Maximum number of return / yield for function / method body -max-returns=100 - -# Maximum number of statements in function / method body -max-statements=100 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=0 - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions= ===================================== pyproject.toml ===================================== @@ -163,24 +163,42 @@ select = [ "C901", # mccabe # "D", # pydocstyle "E", # pycodestyle + # "ERA", # eradicate "F", # pyflakes # "FBT", # flake8-boolean-trap # "I", # flake8-tidy-imports, isort - "M", # Meta rules "N", # pep8-naming + "PGH", # pylint + "PLC", # pylint + "PLE", # pylint + "PLR", # pylint + "PLW", # pylint "Q", # flake8-quotes "RUF", # Ruff-specific rules + # "RET", # flake8-return "S", # flake8-bandit - "T", # flake8-debugger, flake8-print - "U", # pyupgrade + # "T", # flake8-debugger, flake8-print + "UP", # pyupgrade "W", # pycodestyle "YTT", # flake8-2020 ] ignore = [ - "S101", # Use of `assert` detected - "FBT003", # Boolean positional value in function call + "A003", # Class attribute is shadowing python builtin + "B904", # Within an except clause .. "BLE001", # Blind except Exception: statement + "C901", # too complex + "FBT003", # Boolean positional value in function call + "N802", # Function name should be lower case + "N806", # Variable should be lower case + "N817", # CamelCase imported as acronym + "N818", # Exception name should be named with an Error suffix + "RUF001", # AmbiguousUnicodeCharacterString + "RUF002", # AmbiguousUnicodeCharacterDocstring + "RUF003", # AmbiguousUnicodeCharacterComment + "RUF100", # Unused `noqa` directive + "S101", # Use of `assert` detected + "UP007", # Use X | Y for type annotations ] exclude = [ @@ -197,7 +215,7 @@ exclude = [ "typings", "gajim/common/config.py", # legacy module, will be removed "gajim/common/optparser.py", # legacy module, will be removed - "gajim/common/socks5.py", # legacy module, will be removed + "gajim/common/socks5.py", # legacy module, will be removed ] # Allow unused variables when underscore-prefixed. ===================================== scripts/pre-push-tests.sh ===================================== @@ -6,10 +6,10 @@ set -e GREEN='\033[0;32m' -./scripts/dev/pylint-ci.sh gajim -echo "${GREEN}pylint: \t OK" -mypy gajim -echo "${GREEN}mypy: \t\t OK" -codespell -I codespell.conf --skip="*__pycache__*,gajim/data/icons,gajim/data/sounds,gajim/data/emoticons" gajim +pyright +echo "${GREEN}pyright: \t OK" +ruff . +echo "${GREEN}ruff: \t\t OK" +codespell gajim echo "${GREEN}codespell: \t OK" echo "${GREEN}ready to push" ===================================== setup.cfg ===================================== @@ -1,27 +1,3 @@ -[flake8] -ignore = W504, C901 -exclude = - __pycache__, - build, - dist, - debian_build, - test, - typings, - gajim/common/config.py, - gajim/common/optparser.py, - gajim/common/regex.py, - gajim/common/socks5.py, - gajim/gui, -max-complexity = 15 -builtins=_ -max-line-length = 80 -statistics = True -count = True - -inline-quotes = single -multiline-quotes = ''' -docstring-quotes = ''' - [metadata] name = gajim version = attr: gajim.__version__ ===================================== setup.py ===================================== @@ -156,7 +156,7 @@ def merge(in_file: Path, log.info('Compiling %s >> %s', in_file, out_file) -class build(_build): +class Build(_build): def run(self): build_translation() if sys.platform != 'win32': @@ -165,7 +165,7 @@ def run(self): _build.run(self) -class install(_install): +class Install(_install): def run(self): data_files = cast(DataFilesT, self.distribution.data_files) # pyright: ignore # noqa: E501 install_trans(data_files) @@ -187,8 +187,8 @@ def run(self): setup( cmdclass={ - 'build_py': build, - 'install': install, + 'build_py': Build, + 'install': Install, }, entry_points={ 'console_scripts': [ ===================================== test/no_gui/test_styling.py ===================================== @@ -5,7 +5,7 @@ gui.init('gtk') from gajim.common import app # Avoids circular imports from common.helpers -import gajim.common.styling as styling +from gajim.common import styling from gajim.common.styling import PlainBlock from gajim.common.styling import PreBlock from gajim.common.styling import QuoteBlock View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5265a80ce7ac7343cb299c8eb1e79cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5265a80ce7ac7343cb299c8eb1e79cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Translations: Use p_() method for translation context
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5265a80c by wurstsalat at 2022-12-04T22:56:12+01:00 refactor: Translations: Use p_() method for translation context - - - - - 13 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/preview_helpers.py - gajim/gtk/accounts.py - gajim/gtk/advanced_config.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/groupchat_info.py - gajim/gtk/menus.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/tooltips.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/common/const.py ===================================== @@ -31,7 +31,7 @@ from nbxmpp.protocol import JID from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ STOP_EVENT = True @@ -354,21 +354,21 @@ class CallType(Enum): MUC_CREATION_EXAMPLES = [ - (Q_('?Group chat name:Team'), - Q_('?Group chat description:Project discussion'), - Q_('?Group chat address:team')), - (Q_('?Group chat name:Family'), - Q_('?Group chat description:Spring gathering'), - Q_('?Group chat address:family')), - (Q_('?Group chat name:Vacation'), - Q_('?Group chat description:Trip planning'), - Q_('?Group chat address:vacation')), - (Q_('?Group chat name:Repairs'), - Q_('?Group chat description:Local help group'), - Q_('?Group chat address:repairs')), - (Q_('?Group chat name:News'), - Q_('?Group chat description:Local news and reports'), - Q_('?Group chat address:news')), + (p_('Group chat name', 'Team'), + p_('Group chat description', 'Project discussion'), + p_('Group chat address', 'team')), + (p_('Group chat name', 'Family'), + p_('Group chat description', 'Spring gathering'), + p_('Group chat address', 'family')), + (p_('Group chat name', 'Vacation'), + p_('Group chat description', 'Trip planning'), + p_('Group chat address', 'vacation')), + (p_('Group chat name', 'Repairs'), + p_('Group chat description', 'Local help group'), + p_('Group chat address', 'repairs')), + (p_('Group chat name', 'News'), + p_('Group chat description', 'Local news and reports'), + p_('Group chat address', 'news')), ] @@ -921,22 +921,22 @@ def is_active(self): ] SHOW_STRING = { - 'dnd': _('Busy'), - 'xa': _('Not Available'), - 'chat': _('Free for Chat'), - 'online': Q_('?user status:Available'), + 'dnd': p_('User status', 'Busy'), + 'xa': p_('User status', 'Not Available'), + 'chat': p_('User status', 'Free for Chat'), + 'online': p_('User status', 'Available'), 'connecting': _('Connecting'), - 'away': _('Away'), + 'away': p_('User status', 'Away'), 'offline': _('Offline'), } SHOW_STRING_MNEMONIC = { - 'dnd': _('_Busy'), - 'xa': _('_Not Available'), - 'chat': _('_Free for Chat'), - 'online': Q_('?user status:_Available'), + 'dnd': p_('User status', '_Busy'), + 'xa': p_('User status', '_Not Available'), + 'chat': p_('User status', '_Free for Chat'), + 'online': p_('User status', '_Available'), 'connecting': _('Connecting'), - 'away': _('A_way'), + 'away': p_('User status', 'A_way'), 'offline': _('_Offline'), } ===================================== gajim/common/helpers.py ===================================== @@ -88,7 +88,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import iana -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.i18n import get_rfc5646_lang @@ -183,24 +183,24 @@ def get_uf_show(show: str, use_mnemonic: bool = False) -> str: def get_uf_sub(sub: str) -> str: if sub == 'none': - uf_sub = Q_('?Subscription we already have:None') + uf_sub = p_('Contact subscription', 'None') elif sub == 'to': - uf_sub = _('To') + uf_sub = p_('Contact subscription', 'To') elif sub == 'from': - uf_sub = _('From') + uf_sub = p_('Contact subscription', 'From') elif sub == 'both': - uf_sub = _('Both') + uf_sub = p_('Contact subscription', 'Both') else: - uf_sub = _('Unknown') + uf_sub = p_('Contact subscription', 'Unknown') return uf_sub def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: - uf_ask = Q_('?Ask (for Subscription):None') + uf_ask = p_('Contact subscription', 'None') elif ask == 'subscribe': - uf_ask = _('Subscribe') + uf_ask = p_('Contact subscription', 'Subscribe') else: uf_ask = ask @@ -213,19 +213,19 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: role = role.value if role == 'none': - return Q_('?Group Chat Contact Role:None') + return p_('Group chat contact role', 'None') if role == 'moderator': if plural: - return _('Moderators') - return _('Moderator') + return p_('Group chat contact role', 'Moderators') + return p_('Group chat contact role', 'Moderator') if role == 'participant': if plural: - return _('Participants') - return _('Participant') + return p_('Group chat contact role', 'Participants') + return p_('Group chat contact role', 'Participant') if role == 'visitor': if plural: - return _('Visitors') - return _('Visitor') + return p_('Group chat contact role', 'Visitors') + return p_('Group chat contact role', 'Visitor') return '' @@ -237,19 +237,19 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], affiliation = affiliation.value if affiliation == 'none': - return Q_('?Group Chat Contact Affiliation:None') + return p_('Group chat contact affiliation', 'None') if affiliation == 'owner': if plural: - return _('Owners') - return _('Owner') + return p_('Group chat contact affiliation', 'Owners') + return p_('Group chat contact affiliation', 'Owner') if affiliation == 'admin': if plural: - return _('Administrators') - return _('Administrator') + return p_('Group chat contact affiliation', 'Administrators') + return p_('Group chat contact affiliation', 'Administrator') if affiliation == 'member': if plural: - return _('Members') - return _('Member') + return p_('Group chat contact affiliation', 'Members') + return p_('Group chat contact affiliation', 'Member') return '' ===================================== gajim/common/i18n.py ===================================== @@ -122,28 +122,7 @@ def is_rtl_text(text: str) -> bool: return False -def Q_(text: str) -> str: - ''' - Translate the given text, optionally qualified with a special - construction, which will help translators to disambiguate between - same terms, but in different contexts. - - When translated text is returned - this rudimentary construction - will be stripped off, if it's present. - - Here is the construction to use: - Q_("?vcard:Unknown") - - Everything between ? and : - is the qualifier to convey the context - to the translators. Everything after : - is the text itself. - ''' - text = _(text) - if text.startswith('?'): - text = text.split(':', 1)[1] - return text - - -def P_(context: str, message: str) -> str: +def p_(context: str, message: str) -> str: return _translation.pgettext(context, message) ===================================== gajim/common/preview_helpers.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ -from gajim.common.i18n import P_ +from gajim.common.i18n import p_ log = logging.getLogger('gajim.c.preview_helpers') @@ -388,13 +388,13 @@ def fmt(f: float) -> str: degrees = i return '%d°%02d′%02d′′' % (degrees, minutes, seconds) if lat >= 0: - slat = P_('positive latitude', '%sN') % fmt(lat) + slat = p_('positive latitude', '%sN') % fmt(lat) else: - slat = P_('negative latitude', '%sS') % fmt(-lat) + slat = p_('negative latitude', '%sS') % fmt(-lat) if lon >= 0: - slon = P_('positive longitude', '%sE') % fmt(lon) + slon = p_('positive longitude', '%sE') % fmt(lon) else: - slon = P_('negative longitude', '%sW') % fmt(-lon) + slon = p_('negative longitude', '%sW') % fmt(-lon) return '%s %s' % (slat, slon) ===================================== gajim/gtk/accounts.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import passwords from gajim.common.const import ClientState from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.settings import AllSettingsT from gajim.common import types @@ -522,7 +522,7 @@ def __init__(self, account: str) -> None: self._switch_state_label = Gtk.Label() self._switch_state_label.set_xalign(0) self._switch_state_label.set_valign(Gtk.Align.CENTER) - label_width = max(len(Q_('?switch:On')), len(Q_('?switch:Off'))) + label_width = max(len(p_('Switch', 'On')), len(p_('Switch', 'Off'))) self._switch_state_label.set_width_chars(label_width) self._set_label(account_enabled) @@ -552,7 +552,7 @@ def enable_account(self, state: bool) -> None: self._set_label(state) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = p_('Switch', 'On') if active else p_('Switch', 'Off') self._switch_state_label.set_text(text) def _on_enable_switch(self, ===================================== gajim/gtk/advanced_config.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.setting_values import ADVANCED_SETTINGS from gajim.common.setting_values import APP_SETTINGS @@ -53,9 +53,9 @@ class Column(IntEnum): SETTING_TYPES = { - bool: Q_('?config type:Boolean'), - int: Q_('?config type:Integer'), - str: Q_('?config type:Text'), + bool: p_('Configuration type', 'Boolean'), + int: p_('Configuration type', 'Integer'), + str: p_('Configuration type', 'Text'), } @@ -81,7 +81,7 @@ def __init__(self) -> None: renderer_text = Gtk.CellRendererText() renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), + col = Gtk.TreeViewColumn(p_('Configuration', 'Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) col.set_cell_data_func(renderer_text, @@ -94,7 +94,7 @@ def __init__(self) -> None: self.renderer_text.connect('edited', self._on_config_edited) self.renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn( - Q_('?config:Value'), self.renderer_text, text=1) + p_('Configuration', 'Value'), self.renderer_text, text=1) treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) @@ -103,7 +103,8 @@ def __init__(self) -> None: col.set_resizable(True) renderer_text = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) + col = Gtk.TreeViewColumn( + p_('Configuration', 'Type'), renderer_text, text=2) treeview.insert_column(col, -1) col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) @@ -159,7 +160,8 @@ def _on_treeview_selection_changed(self, setting = model[iter_][Column.NAME] desc = ADVANCED_SETTINGS['app'][setting] - self._ui.description.set_text(desc or Q_('?config description:None')) + self._ui.description.set_text( + desc or p_('Configuration description', 'None')) self._ui.reset_button.set_sensitive(not model[iter_][Column.IS_DEFAULT]) def _on_treeview_row_activated(self, ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT @@ -155,7 +155,7 @@ def set_receipt_icon_visible(self, visible: bool) -> None: self._marker_image.set_visible(visible) self._marker_image.set_from_icon_name( 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Received')) + self._marker_image.set_tooltip_text(p_('Message state', 'Received')) def set_correction_icon_visible(self, visible: bool) -> None: self._correction_image.set_visible(visible) ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.helpers import open_uri from gajim.common.helpers import get_groupchat_name from gajim.common.const import RFC5646_LANGUAGE_TAGS @@ -40,63 +40,63 @@ MUC_FEATURES = { 'muc_open': ( 'feather-globe-symbolic', - Q_('?Group chat feature:Open'), + p_('Group chat feature', 'Open'), _('Anyone can join this group chat')), 'muc_membersonly': ( 'feather-user-check-symbolic', - Q_('?Group chat feature:Members Only'), + p_('Group chat feature', 'Members Only'), _('This group chat is restricted ' 'to members only')), 'muc_nonanonymous': ( 'feather-shield-off-symbolic', - Q_('?Group chat feature:Not Anonymous'), + p_('Group chat feature', 'Not Anonymous'), _('All other group chat participants ' 'can see your XMPP address')), 'muc_semianonymous': ( 'feather-shield-symbolic', - Q_('?Group chat feature:Semi-Anonymous'), + p_('Group chat feature', 'Semi-Anonymous'), _('Only moderators can see your XMPP address')), 'muc_moderated': ( 'feather-mic-off-symbolic', - Q_('?Group chat feature:Moderated'), + p_('Group chat feature', 'Moderated'), _('Participants entering this group chat need ' 'to request permission to send messages')), 'muc_unmoderated': ( 'feather-mic-symbolic', - Q_('?Group chat feature:Not Moderated'), + p_('Group chat feature', 'Not Moderated'), _('Participants entering this group chat are ' 'allowed to send messages')), 'muc_public': ( 'feather-eye-symbolic', - Q_('?Group chat feature:Public'), + p_('Group chat feature', 'Public'), _('Group chat can be found via search')), 'muc_hidden': ( 'feather-eye-off-symbolic', - Q_('?Group chat feature:Hidden'), + p_('Group chat feature', 'Hidden'), _('This group chat can not be found via search')), 'muc_passwordprotected': ( 'feather-lock-symbolic', - Q_('?Group chat feature:Password Required'), + p_('Group chat feature', 'Password Required'), _('This group chat ' 'does require a password upon entry')), 'muc_unsecured': ( 'feather-unlock-symbolic', - Q_('?Group chat feature:No Password Required'), + p_('Group chat feature', 'No Password Required'), _('This group chat does not require ' 'a password upon entry')), 'muc_persistent': ( 'feather-hard-drive-symbolic', - Q_('?Group chat feature:Persistent'), + p_('Group chat feature', 'Persistent'), _('This group chat persists ' 'even if there are no participants')), 'muc_temporary': ( 'feather-clock-symbolic', - Q_('?Group chat feature:Temporary'), + p_('Group chat feature', 'Temporary'), _('This group chat will be destroyed ' 'once the last participant left')), 'mam': ( 'feather-server-symbolic', - Q_('?Group chat feature:Archiving'), + p_('Group chat feature', 'Archiving'), _('Messages are archived on the server')), } ===================================== gajim/gtk/menus.py ===================================== @@ -39,7 +39,7 @@ from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType from gajim.common.const import XmppUriQuery @@ -617,10 +617,12 @@ def get_chat_row_menu(contact: types.ChatContactT, timestamp_formatted = timestamp.strftime(time_format) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( - (Q_('?Message row action:Copy'), 'win.copy-message', f'"{copy_text}"')) + (p_('Message row action', 'Copy'), + 'win.copy-message', + f'"{copy_text}"')) menu_items.append( - (Q_('?Message row action:Select Messages…'), + (p_('Message row action', 'Select Messages…'), 'win.activate-message-selection', GLib.Variant('u', log_line_id or 0))) @@ -634,7 +636,7 @@ def get_chat_row_menu(contact: types.ChatContactT, show_quote = False if show_quote: menu_items.append(( - Q_('?Message row action:Quote…'), + p_('Message row action', 'Quote…'), 'win.quote', f'"{text}"')) @@ -644,7 +646,7 @@ def get_chat_row_menu(contact: types.ChatContactT, contact, message_id) if show_correction: menu_items.append(( - Q_('?Message row action:Correct…'), 'win.correct-message', None)) + p_('Message row action', 'Correct…'), 'win.correct-message', None)) show_retract = False if isinstance(contact, GroupchatContact) and contact.is_joined: @@ -665,7 +667,9 @@ def get_chat_row_menu(contact: types.ChatContactT, jid=contact.jid, stanza_id=stanza_id) menu_items.append(( - Q_('?Message row action:Retract…'), 'win.retract-message', param)) + p_('Message row action', 'Retract…'), + 'win.retract-message', + param)) menu = GajimMenu.from_list(menu_items) return menu ===================================== gajim/gtk/profile.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.gui.avatar import clip_circle from gajim.gui.avatar_selector import AvatarSelector @@ -49,19 +49,19 @@ log = logging.getLogger('gajim.gui.profile') MENU_DICT = { - 'fn': Q_('?profile:Full Name'), + 'fn': p_('Profile', 'Full Name'), 'bday': _('Birthday'), - 'gender': Q_('?profile:Gender'), - 'adr': Q_('?profile:Address'), + 'gender': p_('Profile', 'Gender'), + 'adr': p_('Profile', 'Address'), 'email': _('Email'), - 'impp': Q_('?profile:IM Address'), + 'impp': p_('Profile', 'IM Address'), 'tel': _('Phone No.'), - 'org': Q_('?profile:Organisation'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), + 'org': p_('Profile', 'Organisation'), + 'title': p_('Profile', 'Title'), + 'role': p_('Profile', 'Role'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), - 'note': Q_('?profile:Note'), + 'key': p_('Profile', 'Public Encryption Key'), + 'note': p_('Profile', 'Note'), } ===================================== gajim/gtk/settings.py ===================================== @@ -34,7 +34,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.setting_values import AllSettingsT from .util import get_image_button @@ -450,7 +450,7 @@ def on_switch(self, switch: Gtk.Switch, *args: Any) -> None: self._set_label(value) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = p_('Switch', 'On') if active else p_('Switch', 'Off') self._switch_state_label.set_text(text) @@ -871,7 +871,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: custom = app.settings.get_account_setting(self.account, 'use_custom_host') - return Q_('?switch:On') if custom else Q_('?switch:Off') + return p_('Switch', 'On') if custom else p_('Switch', 'Off') class ChangePasswordSetting(DialogSetting): @@ -897,7 +897,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoaway') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class CutstomAutoExtendedAwaySetting(DialogSetting): @@ -906,7 +906,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoxa') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class CustomStunServerSetting(DialogSetting): @@ -915,7 +915,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('use_stun_server') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class NotificationsSetting(DialogSetting): @@ -924,4 +924,4 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('show_notifications') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') ===================================== gajim/gtk/tooltips.py ===================================== @@ -42,7 +42,7 @@ from gajim.common import types from gajim.common import helpers from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import _ from gajim.common.file_props import FileProp @@ -316,26 +316,26 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: assert file_prop.tt_account is not None client = app.get_client(file_prop.tt_account) if file_prop.type_ == 'r': - type_ = Q_('?Noun:Download') + type_ = p_('Noun', 'Download') actor = _('Sender: ') sender = JID.from_string(file_prop.sender) name = client.get_module('Contacts').get_contact(sender.bare).name else: - type_ = Q_('?Noun:Upload') + type_ = p_('Noun', 'Upload') actor = _('Recipient: ') receiver = JID.from_string(file_prop.receiver) name = client.get_module('Contacts').get_contact( receiver.bare).name - properties.append((Q_('?transfer type:Type: '), type_)) + properties.append((p_('File transfer type', 'Type: '), type_)) properties.append((actor, GLib.markup_escape_text(name))) transferred_len = file_prop.received_len if not transferred_len: transferred_len = 0 - properties.append((Q_('?transfer status:Transferred: '), + properties.append((p_('File transfer state', 'Transferred: '), GLib.format_size_full(transferred_len, self.units))) status = self._get_current_status(file_prop) - properties.append((Q_('?transfer status:Status: '), status)) + properties.append((p_('File transfer state', 'Status: '), status)) file_desc = file_prop.desc or '' properties.append((_('Description: '), GLib.markup_escape_text(file_desc))) @@ -361,17 +361,17 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: @staticmethod def _get_current_status(file_prop: FileProp) -> str: if file_prop.stopped: - return Q_('?transfer status:Aborted') + return p_('File transfer state', 'Aborted') if file_prop.completed: - return Q_('?transfer status:Completed') + return p_('File transfer state', 'Completed') if file_prop.paused: - return Q_('?transfer status:Paused') + return p_('File transfer state', 'Paused') if file_prop.stalled: # stalled is not paused. it is like 'frozen' it stopped alone - return Q_('?transfer status:Stalled') + return p_('File transfer state', 'Stalled') if file_prop.connected: if file_prop.started: - return Q_('?transfer status:Transferring') - return Q_('?transfer status:Not started') - return Q_('?transfer status:Not started') + return p_('File transfer state', 'Transferring') + return p_('File transfer state', 'Not started') + return p_('File transfer state', 'Not started') ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -25,7 +25,7 @@ from nbxmpp.modules.vcard4 import VCard from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.const import URIType from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri @@ -40,16 +40,16 @@ 'n': _('Name'), 'bday': _('Birthday'), 'gender': _('Gender'), - 'adr': Q_('?profile:Address'), + 'adr': p_('Profile', 'Address'), 'tel': _('Phone No.'), 'email': _('Email'), - 'impp': _('IM Address'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), - 'org': _('Organisation'), - 'note': Q_('?profile:Note'), + 'impp': p_('Profile', 'IM Address'), + 'title': p_('Profile', 'Title'), + 'role': p_('Profile', 'Role'), + 'org': p_('Profile', 'Organisation'), + 'note': p_('Profile', ':Note'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), + 'key': p_('Profile', 'Public Encryption Key'), } @@ -118,8 +118,8 @@ SEX_VALUES = { 'M': _('Male'), 'F': _('Female'), - 'O': Q_('?Gender:Other'), - 'N': Q_('?Gender:None'), + 'O': p_('Gender', 'Other'), + 'N': p_('Gender', 'None'), 'U': _('Unknown') } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5265a80ce7ac7343cb299c8eb1e79cf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5265a80ce7ac7343cb299c8eb1e79cf3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch i18n-method-switch
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann deleted branch i18n-method-switch at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][i18n-method-switch] 7 commits: cq: Fix typo in annotation
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann pushed to branch i18n-method-switch at gajim / gajim Commits: b69d7b2e by Philipp Hörist at 2022-12-04T19:33:59+01:00 cq: Fix typo in annotation - - - - - 156b23cf by Philipp Hörist at 2022-12-04T19:38:45+01:00 refactor: Raise AssertionError explicitly assert can be optimized out by python, as this is not a assert for helping the type checker it should be raised explicitly. - - - - - 9294172c by Philipp Hörist at 2022-12-04T20:19:38+01:00 refactor: Simplify sorted list insertion Handler lists are very small and are not changed very often - - - - - 5c874f20 by Philipp Hörist at 2022-12-04T20:46:57+01:00 cq: Settings: Mark loop var as not used - - - - - b48e6922 by Philipp Hörist at 2022-12-04T20:56:07+01:00 refactor: Replace lru_cache(maxsize=None) with shorthand - - - - - 16ce9f7e by Philipp Hörist at 2022-12-04T21:39:40+01:00 refactor: Use set literals - - - - - 5265a80c by wurstsalat at 2022-12-04T22:56:12+01:00 refactor: Translations: Use p_() method for translation context - - - - - 25 changed files: - gajim/common/const.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/roster.py - gajim/common/preview_helpers.py - gajim/common/proxy65_manager.py - gajim/common/settings.py - gajim/common/styling.py - gajim/gtk/accounts.py - gajim/gtk/advanced_config.py - gajim/gtk/avatar.py - gajim/gtk/builder.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/dataform.py - gajim/gtk/groupchat_affiliation.py - gajim/gtk/groupchat_info.py - gajim/gtk/menus.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/ssl_error_dialog.py - gajim/gtk/tooltips.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/common/const.py ===================================== @@ -31,7 +31,7 @@ from nbxmpp.protocol import JID from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ STOP_EVENT = True @@ -354,21 +354,21 @@ class CallType(Enum): MUC_CREATION_EXAMPLES = [ - (Q_('?Group chat name:Team'), - Q_('?Group chat description:Project discussion'), - Q_('?Group chat address:team')), - (Q_('?Group chat name:Family'), - Q_('?Group chat description:Spring gathering'), - Q_('?Group chat address:family')), - (Q_('?Group chat name:Vacation'), - Q_('?Group chat description:Trip planning'), - Q_('?Group chat address:vacation')), - (Q_('?Group chat name:Repairs'), - Q_('?Group chat description:Local help group'), - Q_('?Group chat address:repairs')), - (Q_('?Group chat name:News'), - Q_('?Group chat description:Local news and reports'), - Q_('?Group chat address:news')), + (p_('Group chat name', 'Team'), + p_('Group chat description', 'Project discussion'), + p_('Group chat address', 'team')), + (p_('Group chat name', 'Family'), + p_('Group chat description', 'Spring gathering'), + p_('Group chat address', 'family')), + (p_('Group chat name', 'Vacation'), + p_('Group chat description', 'Trip planning'), + p_('Group chat address', 'vacation')), + (p_('Group chat name', 'Repairs'), + p_('Group chat description', 'Local help group'), + p_('Group chat address', 'repairs')), + (p_('Group chat name', 'News'), + p_('Group chat description', 'Local news and reports'), + p_('Group chat address', 'news')), ] @@ -921,22 +921,22 @@ def is_active(self): ] SHOW_STRING = { - 'dnd': _('Busy'), - 'xa': _('Not Available'), - 'chat': _('Free for Chat'), - 'online': Q_('?user status:Available'), + 'dnd': p_('User status', 'Busy'), + 'xa': p_('User status', 'Not Available'), + 'chat': p_('User status', 'Free for Chat'), + 'online': p_('User status', 'Available'), 'connecting': _('Connecting'), - 'away': _('Away'), + 'away': p_('User status', 'Away'), 'offline': _('Offline'), } SHOW_STRING_MNEMONIC = { - 'dnd': _('_Busy'), - 'xa': _('_Not Available'), - 'chat': _('_Free for Chat'), - 'online': Q_('?user status:_Available'), + 'dnd': p_('User status', '_Busy'), + 'xa': p_('User status', '_Not Available'), + 'chat': p_('User status', '_Free for Chat'), + 'online': p_('User status', '_Available'), 'connecting': _('Connecting'), - 'away': _('A_way'), + 'away': p_('User status', 'A_way'), 'offline': _('_Offline'), } ===================================== gajim/common/ged.py ===================================== @@ -20,6 +20,7 @@ import logging import traceback import inspect +import operator from nbxmpp import NodeProcessed @@ -55,23 +56,17 @@ def register_event_handler(self, priority: int, handler: HandlerFuncT) -> None: - if event_name in self.handlers: - handlers_list = self.handlers[event_name] - if (priority, handler) in handlers_list: - # Don’t register same handler/prio multiple times - return - - i = 0 - for i, handler_tuple in enumerate(handlers_list): - if priority < handler_tuple[0]: - break - else: - # no event with smaller prio found, put it at the end - i += 1 - - handlers_list.insert(i, (priority, handler)) - else: + if event_name not in self.handlers: self.handlers[event_name] = [(priority, handler)] + return + + handlers_list = self.handlers[event_name] + if (priority, handler) in handlers_list: + # Don’t register same handler/prio multiple times + return + + handlers_list.append((priority, handler)) + handlers_list.sort(key=operator.itemgetter(0)) def remove_event_handler(self, event_name: str, ===================================== gajim/common/helpers.py ===================================== @@ -88,7 +88,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import iana -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.i18n import get_rfc5646_lang @@ -183,24 +183,24 @@ def get_uf_show(show: str, use_mnemonic: bool = False) -> str: def get_uf_sub(sub: str) -> str: if sub == 'none': - uf_sub = Q_('?Subscription we already have:None') + uf_sub = p_('Contact subscription', 'None') elif sub == 'to': - uf_sub = _('To') + uf_sub = p_('Contact subscription', 'To') elif sub == 'from': - uf_sub = _('From') + uf_sub = p_('Contact subscription', 'From') elif sub == 'both': - uf_sub = _('Both') + uf_sub = p_('Contact subscription', 'Both') else: - uf_sub = _('Unknown') + uf_sub = p_('Contact subscription', 'Unknown') return uf_sub def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: - uf_ask = Q_('?Ask (for Subscription):None') + uf_ask = p_('Contact subscription', 'None') elif ask == 'subscribe': - uf_ask = _('Subscribe') + uf_ask = p_('Contact subscription', 'Subscribe') else: uf_ask = ask @@ -213,19 +213,19 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: role = role.value if role == 'none': - return Q_('?Group Chat Contact Role:None') + return p_('Group chat contact role', 'None') if role == 'moderator': if plural: - return _('Moderators') - return _('Moderator') + return p_('Group chat contact role', 'Moderators') + return p_('Group chat contact role', 'Moderator') if role == 'participant': if plural: - return _('Participants') - return _('Participant') + return p_('Group chat contact role', 'Participants') + return p_('Group chat contact role', 'Participant') if role == 'visitor': if plural: - return _('Visitors') - return _('Visitor') + return p_('Group chat contact role', 'Visitors') + return p_('Group chat contact role', 'Visitor') return '' @@ -237,19 +237,19 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], affiliation = affiliation.value if affiliation == 'none': - return Q_('?Group Chat Contact Affiliation:None') + return p_('Group chat contact affiliation', 'None') if affiliation == 'owner': if plural: - return _('Owners') - return _('Owner') + return p_('Group chat contact affiliation', 'Owners') + return p_('Group chat contact affiliation', 'Owner') if affiliation == 'admin': if plural: - return _('Administrators') - return _('Administrator') + return p_('Group chat contact affiliation', 'Administrators') + return p_('Group chat contact affiliation', 'Administrator') if affiliation == 'member': if plural: - return _('Members') - return _('Member') + return p_('Group chat contact affiliation', 'Members') + return p_('Group chat contact affiliation', 'Member') return '' ===================================== gajim/common/i18n.py ===================================== @@ -122,28 +122,7 @@ def is_rtl_text(text: str) -> bool: return False -def Q_(text: str) -> str: - ''' - Translate the given text, optionally qualified with a special - construction, which will help translators to disambiguate between - same terms, but in different contexts. - - When translated text is returned - this rudimentary construction - will be stripped off, if it's present. - - Here is the construction to use: - Q_("?vcard:Unknown") - - Everything between ? and : - is the qualifier to convey the context - to the translators. Everything after : - is the text itself. - ''' - text = _(text) - if text.startswith('?'): - text = text.split(':', 1)[1] - return text - - -def P_(context: str, message: str) -> str: +def p_(context: str, message: str) -> str: return _translation.pgettext(context, message) ===================================== gajim/common/modules/mam.py ===================================== @@ -342,7 +342,7 @@ def _get_query_id(self, jid: str) -> str: self._mam_query_ids[jid] = query_id return query_id - def _get_query_params(self) -> tuple[Optional[ſtr], Optional[datetime]]: + def _get_query_params(self) -> tuple[Optional[str], Optional[datetime]]: own_jid = self._con.get_own_jid().bare archive = app.storage.archive.get_archive_infos(own_jid) ===================================== gajim/common/modules/message.py ===================================== @@ -61,8 +61,7 @@ def __init__(self, con: types.Client) -> None: ] # XEPs for which this message module should not be executed - self._message_namespaces = set([Namespace.ROSTERX, - Namespace.IBB]) + self._message_namespaces = {Namespace.ROSTERX, Namespace.IBB} def _check_if_unknown_contact(self, _con: types.xmppClient, ===================================== gajim/common/modules/roster.py ===================================== @@ -185,13 +185,13 @@ def _get_items_with_group(self, group: str) -> list[RosterItem]: def remove_group(self, group: str) -> None: items = self._get_items_with_group(group) for item in items: - new_groups = item.groups - set([group]) + new_groups = item.groups - {group} self.set_groups(item.jid, new_groups) def rename_group(self, group: str, new_group: str) -> None: items = self._get_items_with_group(group) for item in items: - new_groups = item.groups - set([group]) + new_groups = item.groups - {group} new_groups.add(new_group) self.set_groups(item.jid, new_groups) ===================================== gajim/common/preview_helpers.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.helpers import sanitize_filename from gajim.common.i18n import _ -from gajim.common.i18n import P_ +from gajim.common.i18n import p_ log = logging.getLogger('gajim.c.preview_helpers') @@ -388,13 +388,13 @@ def fmt(f: float) -> str: degrees = i return '%d°%02d′%02d′′' % (degrees, minutes, seconds) if lat >= 0: - slat = P_('positive latitude', '%sN') % fmt(lat) + slat = p_('positive latitude', '%sN') % fmt(lat) else: - slat = P_('negative latitude', '%sS') % fmt(-lat) + slat = p_('negative latitude', '%sS') % fmt(-lat) if lon >= 0: - slon = P_('positive longitude', '%sE') % fmt(lon) + slon = p_('positive longitude', '%sE') % fmt(lon) else: - slon = P_('negative longitude', '%sW') % fmt(-lon) + slon = p_('negative longitude', '%sW') % fmt(-lon) return '%s %s' % (slat, slon) ===================================== gajim/common/proxy65_manager.py ===================================== @@ -341,7 +341,7 @@ def pollin(self): self.disconnect() self.state += 1 else: - assert False, 'unexpected state: %d' % self.state + raise AssertionError('unexpected state: %d' % self.state) def do_connect(self): try: @@ -478,7 +478,7 @@ def pollin(self): self.disconnect() self.state += 1 else: - assert False, 'unexpected state: %d' % self.state + raise AssertionError('unexpected state: %d' % self.state) def do_connect(self): try: ===================================== gajim/common/settings.py ===================================== @@ -414,12 +414,12 @@ def _migrate_app_settings(self) -> None: # Migrate deprecated settings value = app_settings.pop('send_chatstate_muc_default', None) if value is not None: - for account, settings in self._account_settings.items(): + for _account, settings in self._account_settings.items(): settings['account']['gc_send_chatstate_default'] = value value = app_settings.pop('send_chatstate_default', None) if value is not None: - for account, settings in self._account_settings.items(): + for _account, settings in self._account_settings.items(): settings['account']['send_chatstate_default'] = value value = app_settings.pop('print_join_left_default', None) ===================================== gajim/common/styling.py ===================================== @@ -37,7 +37,7 @@ EMPH = '_' WHITESPACE = set(string.whitespace) -SPAN_DIRS = set([PRE, STRONG, STRIKE, EMPH]) +SPAN_DIRS = {PRE, STRONG, STRIKE, EMPH} VALID_SPAN_START = WHITESPACE | SPAN_DIRS PRE_RX = r'(?P<pre>^```.+?(^```$(.|\Z)))' ===================================== gajim/gtk/accounts.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import passwords from gajim.common.const import ClientState from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.settings import AllSettingsT from gajim.common import types @@ -522,7 +522,7 @@ def __init__(self, account: str) -> None: self._switch_state_label = Gtk.Label() self._switch_state_label.set_xalign(0) self._switch_state_label.set_valign(Gtk.Align.CENTER) - label_width = max(len(Q_('?switch:On')), len(Q_('?switch:Off'))) + label_width = max(len(p_('Switch', 'On')), len(p_('Switch', 'Off'))) self._switch_state_label.set_width_chars(label_width) self._set_label(account_enabled) @@ -552,7 +552,7 @@ def enable_account(self, state: bool) -> None: self._set_label(state) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = p_('Switch', 'On') if active else p_('Switch', 'Off') self._switch_state_label.set_text(text) def _on_enable_switch(self, ===================================== gajim/gtk/advanced_config.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.setting_values import ADVANCED_SETTINGS from gajim.common.setting_values import APP_SETTINGS @@ -53,9 +53,9 @@ class Column(IntEnum): SETTING_TYPES = { - bool: Q_('?config type:Boolean'), - int: Q_('?config type:Integer'), - str: Q_('?config type:Text'), + bool: p_('Configuration type', 'Boolean'), + int: p_('Configuration type', 'Integer'), + str: p_('Configuration type', 'Text'), } @@ -81,7 +81,7 @@ def __init__(self) -> None: renderer_text = Gtk.CellRendererText() renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), + col = Gtk.TreeViewColumn(p_('Configuration', 'Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) col.set_cell_data_func(renderer_text, @@ -94,7 +94,7 @@ def __init__(self) -> None: self.renderer_text.connect('edited', self._on_config_edited) self.renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn( - Q_('?config:Value'), self.renderer_text, text=1) + p_('Configuration', 'Value'), self.renderer_text, text=1) treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) @@ -103,7 +103,8 @@ def __init__(self) -> None: col.set_resizable(True) renderer_text = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) + col = Gtk.TreeViewColumn( + p_('Configuration', 'Type'), renderer_text, text=2) treeview.insert_column(col, -1) col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) @@ -159,7 +160,8 @@ def _on_treeview_selection_changed(self, setting = model[iter_][Column.NAME] desc = ADVANCED_SETTINGS['app'][setting] - self._ui.description.set_text(desc or Q_('?config description:None')) + self._ui.description.set_text( + desc or p_('Configuration description', 'None')) self._ui.reset_button.set_sensitive(not model[iter_][Column.IS_DEFAULT]) def _on_treeview_row_activated(self, ===================================== gajim/gtk/avatar.py ===================================== @@ -20,7 +20,7 @@ import logging import hashlib from math import pi -from functools import lru_cache +import functools from collections import defaultdict from pathlib import Path @@ -109,7 +109,7 @@ def generate_avatar(letters: str, return context.get_target() -@lru_cache(maxsize=None) +(a)functools.cache def generate_default_avatar(letter: str, color: tuple[float, float, float], size: int, @@ -122,7 +122,7 @@ def generate_default_avatar(letter: str, return surface -@lru_cache(maxsize=None) +(a)functools.cache def make_workspace_avatar(letter: str, color: tuple[float, float, float], size: int, @@ -186,7 +186,7 @@ def add_status_to_avatar(surface: cairo.ImageSurface, return context.get_target() -@lru_cache(maxsize=128) +(a)functools.lru_cache(maxsize=128) def get_show_circle(show: Union[str, types.PresenceShowT], size: int, scale: int ===================================== gajim/gtk/builder.py ===================================== @@ -57,7 +57,7 @@ def __init__(self, self._builder.add_from_string(xml_text) @staticmethod - @functools.lru_cache(maxsize=None) + @functools.cache def _load_string_from_filename(filename: str, gettext_: Any) -> str: file_path = str(configpaths.get('GUI') / filename) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT @@ -155,7 +155,7 @@ def set_receipt_icon_visible(self, visible: bool) -> None: self._marker_image.set_visible(visible) self._marker_image.set_from_icon_name( 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Received')) + self._marker_image.set_tooltip_text(p_('Message state', 'Received')) def set_correction_icon_visible(self, visible: bool) -> None: self._correction_image.set_visible(visible) ===================================== gajim/gtk/dataform.py ===================================== @@ -187,7 +187,7 @@ def _analyse_fields(form_node: Union[SimpleDataForm, MultipleDataForm], # Don’t overwrite option return - label_lengths = set([0]) + label_lengths = {0} for field in form_node.iter_fields(): if field.type_ == 'hidden': continue ===================================== gajim/gtk/groupchat_affiliation.py ===================================== @@ -213,7 +213,7 @@ def _set_remove_button_state(self, self._ui.remove_button.set_sensitive(True) return - if set(['owner', 'admin']).intersection(selected_affiliations): + if {'owner', 'admin'}.intersection(selected_affiliations): self._ui.remove_button.set_sensitive(False) self._ui.remove_button.set_tooltip_text( _('You are not allowed to modify the affiliation ' ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.helpers import open_uri from gajim.common.helpers import get_groupchat_name from gajim.common.const import RFC5646_LANGUAGE_TAGS @@ -40,63 +40,63 @@ MUC_FEATURES = { 'muc_open': ( 'feather-globe-symbolic', - Q_('?Group chat feature:Open'), + p_('Group chat feature', 'Open'), _('Anyone can join this group chat')), 'muc_membersonly': ( 'feather-user-check-symbolic', - Q_('?Group chat feature:Members Only'), + p_('Group chat feature', 'Members Only'), _('This group chat is restricted ' 'to members only')), 'muc_nonanonymous': ( 'feather-shield-off-symbolic', - Q_('?Group chat feature:Not Anonymous'), + p_('Group chat feature', 'Not Anonymous'), _('All other group chat participants ' 'can see your XMPP address')), 'muc_semianonymous': ( 'feather-shield-symbolic', - Q_('?Group chat feature:Semi-Anonymous'), + p_('Group chat feature', 'Semi-Anonymous'), _('Only moderators can see your XMPP address')), 'muc_moderated': ( 'feather-mic-off-symbolic', - Q_('?Group chat feature:Moderated'), + p_('Group chat feature', 'Moderated'), _('Participants entering this group chat need ' 'to request permission to send messages')), 'muc_unmoderated': ( 'feather-mic-symbolic', - Q_('?Group chat feature:Not Moderated'), + p_('Group chat feature', 'Not Moderated'), _('Participants entering this group chat are ' 'allowed to send messages')), 'muc_public': ( 'feather-eye-symbolic', - Q_('?Group chat feature:Public'), + p_('Group chat feature', 'Public'), _('Group chat can be found via search')), 'muc_hidden': ( 'feather-eye-off-symbolic', - Q_('?Group chat feature:Hidden'), + p_('Group chat feature', 'Hidden'), _('This group chat can not be found via search')), 'muc_passwordprotected': ( 'feather-lock-symbolic', - Q_('?Group chat feature:Password Required'), + p_('Group chat feature', 'Password Required'), _('This group chat ' 'does require a password upon entry')), 'muc_unsecured': ( 'feather-unlock-symbolic', - Q_('?Group chat feature:No Password Required'), + p_('Group chat feature', 'No Password Required'), _('This group chat does not require ' 'a password upon entry')), 'muc_persistent': ( 'feather-hard-drive-symbolic', - Q_('?Group chat feature:Persistent'), + p_('Group chat feature', 'Persistent'), _('This group chat persists ' 'even if there are no participants')), 'muc_temporary': ( 'feather-clock-symbolic', - Q_('?Group chat feature:Temporary'), + p_('Group chat feature', 'Temporary'), _('This group chat will be destroyed ' 'once the last participant left')), 'mam': ( 'feather-server-symbolic', - Q_('?Group chat feature:Archiving'), + p_('Group chat feature', 'Archiving'), _('Messages are archived on the server')), } ===================================== gajim/gtk/menus.py ===================================== @@ -39,7 +39,7 @@ from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType from gajim.common.const import XmppUriQuery @@ -617,10 +617,12 @@ def get_chat_row_menu(contact: types.ChatContactT, timestamp_formatted = timestamp.strftime(time_format) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( - (Q_('?Message row action:Copy'), 'win.copy-message', f'"{copy_text}"')) + (p_('Message row action', 'Copy'), + 'win.copy-message', + f'"{copy_text}"')) menu_items.append( - (Q_('?Message row action:Select Messages…'), + (p_('Message row action', 'Select Messages…'), 'win.activate-message-selection', GLib.Variant('u', log_line_id or 0))) @@ -634,7 +636,7 @@ def get_chat_row_menu(contact: types.ChatContactT, show_quote = False if show_quote: menu_items.append(( - Q_('?Message row action:Quote…'), + p_('Message row action', 'Quote…'), 'win.quote', f'"{text}"')) @@ -644,7 +646,7 @@ def get_chat_row_menu(contact: types.ChatContactT, contact, message_id) if show_correction: menu_items.append(( - Q_('?Message row action:Correct…'), 'win.correct-message', None)) + p_('Message row action', 'Correct…'), 'win.correct-message', None)) show_retract = False if isinstance(contact, GroupchatContact) and contact.is_joined: @@ -665,7 +667,9 @@ def get_chat_row_menu(contact: types.ChatContactT, jid=contact.jid, stanza_id=stanza_id) menu_items.append(( - Q_('?Message row action:Retract…'), 'win.retract-message', param)) + p_('Message row action', 'Retract…'), + 'win.retract-message', + param)) menu = GajimMenu.from_list(menu_items) return menu ===================================== gajim/gtk/profile.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.gui.avatar import clip_circle from gajim.gui.avatar_selector import AvatarSelector @@ -49,19 +49,19 @@ log = logging.getLogger('gajim.gui.profile') MENU_DICT = { - 'fn': Q_('?profile:Full Name'), + 'fn': p_('Profile', 'Full Name'), 'bday': _('Birthday'), - 'gender': Q_('?profile:Gender'), - 'adr': Q_('?profile:Address'), + 'gender': p_('Profile', 'Gender'), + 'adr': p_('Profile', 'Address'), 'email': _('Email'), - 'impp': Q_('?profile:IM Address'), + 'impp': p_('Profile', 'IM Address'), 'tel': _('Phone No.'), - 'org': Q_('?profile:Organisation'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), + 'org': p_('Profile', 'Organisation'), + 'title': p_('Profile', 'Title'), + 'role': p_('Profile', 'Role'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), - 'note': Q_('?profile:Note'), + 'key': p_('Profile', 'Public Encryption Key'), + 'note': p_('Profile', 'Note'), } ===================================== gajim/gtk/settings.py ===================================== @@ -34,7 +34,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.setting_values import AllSettingsT from .util import get_image_button @@ -450,7 +450,7 @@ def on_switch(self, switch: Gtk.Switch, *args: Any) -> None: self._set_label(value) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = p_('Switch', 'On') if active else p_('Switch', 'Off') self._switch_state_label.set_text(text) @@ -871,7 +871,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: custom = app.settings.get_account_setting(self.account, 'use_custom_host') - return Q_('?switch:On') if custom else Q_('?switch:Off') + return p_('Switch', 'On') if custom else p_('Switch', 'Off') class ChangePasswordSetting(DialogSetting): @@ -897,7 +897,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoaway') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class CutstomAutoExtendedAwaySetting(DialogSetting): @@ -906,7 +906,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoxa') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class CustomStunServerSetting(DialogSetting): @@ -915,7 +915,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('use_stun_server') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') class NotificationsSetting(DialogSetting): @@ -924,4 +924,4 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('show_notifications') - return Q_('?switch:On') if value else Q_('?switch:Off') + return p_('Switch', 'On') if value else p_('Switch', 'Off') ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -91,7 +91,7 @@ def _on_connect_clicked(self, _button: Gtk.Button) -> None: ignored_tls_errors = None if self._error == Gio.TlsCertificateFlags.EXPIRED: - ignored_tls_errors = set([Gio.TlsCertificateFlags.EXPIRED]) + ignored_tls_errors = {Gio.TlsCertificateFlags.EXPIRED} self.destroy() self._client.connect(ignored_tls_errors=ignored_tls_errors) ===================================== gajim/gtk/tooltips.py ===================================== @@ -42,7 +42,7 @@ from gajim.common import types from gajim.common import helpers from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.i18n import _ from gajim.common.file_props import FileProp @@ -316,26 +316,26 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: assert file_prop.tt_account is not None client = app.get_client(file_prop.tt_account) if file_prop.type_ == 'r': - type_ = Q_('?Noun:Download') + type_ = p_('Noun', 'Download') actor = _('Sender: ') sender = JID.from_string(file_prop.sender) name = client.get_module('Contacts').get_contact(sender.bare).name else: - type_ = Q_('?Noun:Upload') + type_ = p_('Noun', 'Upload') actor = _('Recipient: ') receiver = JID.from_string(file_prop.receiver) name = client.get_module('Contacts').get_contact( receiver.bare).name - properties.append((Q_('?transfer type:Type: '), type_)) + properties.append((p_('File transfer type', 'Type: '), type_)) properties.append((actor, GLib.markup_escape_text(name))) transferred_len = file_prop.received_len if not transferred_len: transferred_len = 0 - properties.append((Q_('?transfer status:Transferred: '), + properties.append((p_('File transfer state', 'Transferred: '), GLib.format_size_full(transferred_len, self.units))) status = self._get_current_status(file_prop) - properties.append((Q_('?transfer status:Status: '), status)) + properties.append((p_('File transfer state', 'Status: '), status)) file_desc = file_prop.desc or '' properties.append((_('Description: '), GLib.markup_escape_text(file_desc))) @@ -361,17 +361,17 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: @staticmethod def _get_current_status(file_prop: FileProp) -> str: if file_prop.stopped: - return Q_('?transfer status:Aborted') + return p_('File transfer state', 'Aborted') if file_prop.completed: - return Q_('?transfer status:Completed') + return p_('File transfer state', 'Completed') if file_prop.paused: - return Q_('?transfer status:Paused') + return p_('File transfer state', 'Paused') if file_prop.stalled: # stalled is not paused. it is like 'frozen' it stopped alone - return Q_('?transfer status:Stalled') + return p_('File transfer state', 'Stalled') if file_prop.connected: if file_prop.started: - return Q_('?transfer status:Transferring') - return Q_('?transfer status:Not started') - return Q_('?transfer status:Not started') + return p_('File transfer state', 'Transferring') + return p_('File transfer state', 'Not started') + return p_('File transfer state', 'Not started') ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -25,7 +25,7 @@ from nbxmpp.modules.vcard4 import VCard from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import p_ from gajim.common.const import URIType from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri @@ -40,16 +40,16 @@ 'n': _('Name'), 'bday': _('Birthday'), 'gender': _('Gender'), - 'adr': Q_('?profile:Address'), + 'adr': p_('Profile', 'Address'), 'tel': _('Phone No.'), 'email': _('Email'), - 'impp': _('IM Address'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), - 'org': _('Organisation'), - 'note': Q_('?profile:Note'), + 'impp': p_('Profile', 'IM Address'), + 'title': p_('Profile', 'Title'), + 'role': p_('Profile', 'Role'), + 'org': p_('Profile', 'Organisation'), + 'note': p_('Profile', ':Note'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), + 'key': p_('Profile', 'Public Encryption Key'), } @@ -118,8 +118,8 @@ SEX_VALUES = { 'M': _('Male'), 'F': _('Female'), - 'O': Q_('?Gender:Other'), - 'N': Q_('?Gender:None'), + 'O': p_('Gender', 'Other'), + 'N': p_('Gender', 'None'), 'U': _('Unknown') } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8db1df894f2b9dc119e0e8e13620dd8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8db1df894f2b9dc119e0e8e13620dd8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: cq: Fix typo in annotation
by Philipp Hörist (＠lovetox) 04 Dec '22

04 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b69d7b2e by Philipp Hörist at 2022-12-04T19:33:59+01:00 cq: Fix typo in annotation - - - - - 156b23cf by Philipp Hörist at 2022-12-04T19:38:45+01:00 refactor: Raise AssertionError explicitly assert can be optimized out by python, as this is not a assert for helping the type checker it should be raised explicitly. - - - - - 9294172c by Philipp Hörist at 2022-12-04T20:19:38+01:00 refactor: Simplify sorted list insertion Handler lists are very small and are not changed very often - - - - - 5c874f20 by Philipp Hörist at 2022-12-04T20:46:57+01:00 cq: Settings: Mark loop var as not used - - - - - b48e6922 by Philipp Hörist at 2022-12-04T20:56:07+01:00 refactor: Replace lru_cache(maxsize=None) with shorthand - - - - - 16ce9f7e by Philipp Hörist at 2022-12-04T21:39:40+01:00 refactor: Use set literals - - - - - 12 changed files: - gajim/common/ged.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/roster.py - gajim/common/proxy65_manager.py - gajim/common/settings.py - gajim/common/styling.py - gajim/gtk/avatar.py - gajim/gtk/builder.py - gajim/gtk/dataform.py - gajim/gtk/groupchat_affiliation.py - gajim/gtk/ssl_error_dialog.py Changes: ===================================== gajim/common/ged.py ===================================== @@ -20,6 +20,7 @@ import logging import traceback import inspect +import operator from nbxmpp import NodeProcessed @@ -55,23 +56,17 @@ def register_event_handler(self, priority: int, handler: HandlerFuncT) -> None: - if event_name in self.handlers: - handlers_list = self.handlers[event_name] - if (priority, handler) in handlers_list: - # Don’t register same handler/prio multiple times - return - - i = 0 - for i, handler_tuple in enumerate(handlers_list): - if priority < handler_tuple[0]: - break - else: - # no event with smaller prio found, put it at the end - i += 1 - - handlers_list.insert(i, (priority, handler)) - else: + if event_name not in self.handlers: self.handlers[event_name] = [(priority, handler)] + return + + handlers_list = self.handlers[event_name] + if (priority, handler) in handlers_list: + # Don’t register same handler/prio multiple times + return + + handlers_list.append((priority, handler)) + handlers_list.sort(key=operator.itemgetter(0)) def remove_event_handler(self, event_name: str, ===================================== gajim/common/modules/mam.py ===================================== @@ -342,7 +342,7 @@ def _get_query_id(self, jid: str) -> str: self._mam_query_ids[jid] = query_id return query_id - def _get_query_params(self) -> tuple[Optional[ſtr], Optional[datetime]]: + def _get_query_params(self) -> tuple[Optional[str], Optional[datetime]]: own_jid = self._con.get_own_jid().bare archive = app.storage.archive.get_archive_infos(own_jid) ===================================== gajim/common/modules/message.py ===================================== @@ -61,8 +61,7 @@ def __init__(self, con: types.Client) -> None: ] # XEPs for which this message module should not be executed - self._message_namespaces = set([Namespace.ROSTERX, - Namespace.IBB]) + self._message_namespaces = {Namespace.ROSTERX, Namespace.IBB} def _check_if_unknown_contact(self, _con: types.xmppClient, ===================================== gajim/common/modules/roster.py ===================================== @@ -185,13 +185,13 @@ def _get_items_with_group(self, group: str) -> list[RosterItem]: def remove_group(self, group: str) -> None: items = self._get_items_with_group(group) for item in items: - new_groups = item.groups - set([group]) + new_groups = item.groups - {group} self.set_groups(item.jid, new_groups) def rename_group(self, group: str, new_group: str) -> None: items = self._get_items_with_group(group) for item in items: - new_groups = item.groups - set([group]) + new_groups = item.groups - {group} new_groups.add(new_group) self.set_groups(item.jid, new_groups) ===================================== gajim/common/proxy65_manager.py ===================================== @@ -341,7 +341,7 @@ def pollin(self): self.disconnect() self.state += 1 else: - assert False, 'unexpected state: %d' % self.state + raise AssertionError('unexpected state: %d' % self.state) def do_connect(self): try: @@ -478,7 +478,7 @@ def pollin(self): self.disconnect() self.state += 1 else: - assert False, 'unexpected state: %d' % self.state + raise AssertionError('unexpected state: %d' % self.state) def do_connect(self): try: ===================================== gajim/common/settings.py ===================================== @@ -414,12 +414,12 @@ def _migrate_app_settings(self) -> None: # Migrate deprecated settings value = app_settings.pop('send_chatstate_muc_default', None) if value is not None: - for account, settings in self._account_settings.items(): + for _account, settings in self._account_settings.items(): settings['account']['gc_send_chatstate_default'] = value value = app_settings.pop('send_chatstate_default', None) if value is not None: - for account, settings in self._account_settings.items(): + for _account, settings in self._account_settings.items(): settings['account']['send_chatstate_default'] = value value = app_settings.pop('print_join_left_default', None) ===================================== gajim/common/styling.py ===================================== @@ -37,7 +37,7 @@ EMPH = '_' WHITESPACE = set(string.whitespace) -SPAN_DIRS = set([PRE, STRONG, STRIKE, EMPH]) +SPAN_DIRS = {PRE, STRONG, STRIKE, EMPH} VALID_SPAN_START = WHITESPACE | SPAN_DIRS PRE_RX = r'(?P<pre>^```.+?(^```$(.|\Z)))' ===================================== gajim/gtk/avatar.py ===================================== @@ -20,7 +20,7 @@ import logging import hashlib from math import pi -from functools import lru_cache +import functools from collections import defaultdict from pathlib import Path @@ -109,7 +109,7 @@ def generate_avatar(letters: str, return context.get_target() -@lru_cache(maxsize=None) +(a)functools.cache def generate_default_avatar(letter: str, color: tuple[float, float, float], size: int, @@ -122,7 +122,7 @@ def generate_default_avatar(letter: str, return surface -@lru_cache(maxsize=None) +(a)functools.cache def make_workspace_avatar(letter: str, color: tuple[float, float, float], size: int, @@ -186,7 +186,7 @@ def add_status_to_avatar(surface: cairo.ImageSurface, return context.get_target() -@lru_cache(maxsize=128) +(a)functools.lru_cache(maxsize=128) def get_show_circle(show: Union[str, types.PresenceShowT], size: int, scale: int ===================================== gajim/gtk/builder.py ===================================== @@ -57,7 +57,7 @@ def __init__(self, self._builder.add_from_string(xml_text) @staticmethod - @functools.lru_cache(maxsize=None) + @functools.cache def _load_string_from_filename(filename: str, gettext_: Any) -> str: file_path = str(configpaths.get('GUI') / filename) ===================================== gajim/gtk/dataform.py ===================================== @@ -187,7 +187,7 @@ def _analyse_fields(form_node: Union[SimpleDataForm, MultipleDataForm], # Don’t overwrite option return - label_lengths = set([0]) + label_lengths = {0} for field in form_node.iter_fields(): if field.type_ == 'hidden': continue ===================================== gajim/gtk/groupchat_affiliation.py ===================================== @@ -213,7 +213,7 @@ def _set_remove_button_state(self, self._ui.remove_button.set_sensitive(True) return - if set(['owner', 'admin']).intersection(selected_affiliations): + if {'owner', 'admin'}.intersection(selected_affiliations): self._ui.remove_button.set_sensitive(False) self._ui.remove_button.set_tooltip_text( _('You are not allowed to modify the affiliation ' ===================================== gajim/gtk/ssl_error_dialog.py ===================================== @@ -91,7 +91,7 @@ def _on_connect_clicked(self, _button: Gtk.Button) -> None: ignored_tls_errors = None if self._error == Gio.TlsCertificateFlags.EXPIRED: - ignored_tls_errors = set([Gio.TlsCertificateFlags.EXPIRED]) + ignored_tls_errors = {Gio.TlsCertificateFlags.EXPIRED} self.destroy() self._client.connect(ignored_tls_errors=ignored_tls_errors) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/48a1b1ffbb1c071b5d5add9b17d7816… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/48a1b1ffbb1c071b5d5add9b17d7816… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][i18n-method-switch] refactor: Translations: Use P_() method for translation context
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann pushed to branch i18n-method-switch at gajim / gajim Commits: 8db1df89 by wurstsalat at 2022-12-04T20:26:32+01:00 refactor: Translations: Use P_() method for translation context - - - - - 12 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/gtk/accounts.py - gajim/gtk/advanced_config.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/groupchat_info.py - gajim/gtk/menus.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/tooltips.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/common/const.py ===================================== @@ -31,7 +31,7 @@ from nbxmpp.protocol import JID from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ STOP_EVENT = True @@ -354,21 +354,21 @@ class CallType(Enum): MUC_CREATION_EXAMPLES = [ - (Q_('?Group chat name:Team'), - Q_('?Group chat description:Project discussion'), - Q_('?Group chat address:team')), - (Q_('?Group chat name:Family'), - Q_('?Group chat description:Spring gathering'), - Q_('?Group chat address:family')), - (Q_('?Group chat name:Vacation'), - Q_('?Group chat description:Trip planning'), - Q_('?Group chat address:vacation')), - (Q_('?Group chat name:Repairs'), - Q_('?Group chat description:Local help group'), - Q_('?Group chat address:repairs')), - (Q_('?Group chat name:News'), - Q_('?Group chat description:Local news and reports'), - Q_('?Group chat address:news')), + (P_('Group chat name', 'Team'), + P_('Group chat description', 'Project discussion'), + P_('Group chat address', 'team')), + (P_('Group chat name', 'Family'), + P_('Group chat description', 'Spring gathering'), + P_('Group chat address', 'family')), + (P_('Group chat name', 'Vacation'), + P_('Group chat description', 'Trip planning'), + P_('Group chat address', 'vacation')), + (P_('Group chat name', 'Repairs'), + P_('Group chat description', 'Local help group'), + P_('Group chat address', 'repairs')), + (P_('Group chat name', 'News'), + P_('Group chat description', 'Local news and reports'), + P_('Group chat address', 'news')), ] @@ -921,22 +921,22 @@ def is_active(self): ] SHOW_STRING = { - 'dnd': _('Busy'), - 'xa': _('Not Available'), - 'chat': _('Free for Chat'), - 'online': Q_('?user status:Available'), + 'dnd': P_('User status', 'Busy'), + 'xa': P_('User status', 'Not Available'), + 'chat': P_('User status', 'Free for Chat'), + 'online': P_('User status', 'Available'), 'connecting': _('Connecting'), - 'away': _('Away'), + 'away': P_('User status', 'Away'), 'offline': _('Offline'), } SHOW_STRING_MNEMONIC = { - 'dnd': _('_Busy'), - 'xa': _('_Not Available'), - 'chat': _('_Free for Chat'), - 'online': Q_('?user status:_Available'), + 'dnd': P_('User status', '_Busy'), + 'xa': P_('User status', '_Not Available'), + 'chat': P_('User status', '_Free for Chat'), + 'online': P_('User status', '_Available'), 'connecting': _('Connecting'), - 'away': _('A_way'), + 'away': P_('User status', 'A_way'), 'offline': _('_Offline'), } ===================================== gajim/common/helpers.py ===================================== @@ -88,7 +88,7 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import iana -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.i18n import get_rfc5646_lang @@ -183,24 +183,24 @@ def get_uf_show(show: str, use_mnemonic: bool = False) -> str: def get_uf_sub(sub: str) -> str: if sub == 'none': - uf_sub = Q_('?Subscription we already have:None') + uf_sub = P_('Contact subscription', 'None') elif sub == 'to': - uf_sub = _('To') + uf_sub = P_('Contact subscription', 'To') elif sub == 'from': - uf_sub = _('From') + uf_sub = P_('Contact subscription', 'From') elif sub == 'both': - uf_sub = _('Both') + uf_sub = P_('Contact subscription', 'Both') else: - uf_sub = _('Unknown') + uf_sub = P_('Contact subscription', 'Unknown') return uf_sub def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: - uf_ask = Q_('?Ask (for Subscription):None') + uf_ask = P_('Contact subscription', 'None') elif ask == 'subscribe': - uf_ask = _('Subscribe') + uf_ask = P_('Contact subscription', 'Subscribe') else: uf_ask = ask @@ -213,19 +213,19 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: role = role.value if role == 'none': - return Q_('?Group Chat Contact Role:None') + return P_('Group chat contact role', 'None') if role == 'moderator': if plural: - return _('Moderators') - return _('Moderator') + return P_('Group chat contact role', 'Moderators') + return P_('Group chat contact role', 'Moderator') if role == 'participant': if plural: - return _('Participants') - return _('Participant') + return P_('Group chat contact role', 'Participants') + return P_('Group chat contact role', 'Participant') if role == 'visitor': if plural: - return _('Visitors') - return _('Visitor') + return P_('Group chat contact role', 'Visitors') + return P_('Group chat contact role', 'Visitor') return '' @@ -237,19 +237,19 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], affiliation = affiliation.value if affiliation == 'none': - return Q_('?Group Chat Contact Affiliation:None') + return P_('Group chat contact affiliation', 'None') if affiliation == 'owner': if plural: - return _('Owners') - return _('Owner') + return P_('Group chat contact affiliation', 'Owners') + return P_('Group chat contact affiliation', 'Owner') if affiliation == 'admin': if plural: - return _('Administrators') - return _('Administrator') + return P_('Group chat contact affiliation', 'Administrators') + return P_('Group chat contact affiliation', 'Administrator') if affiliation == 'member': if plural: - return _('Members') - return _('Member') + return P_('Group chat contact affiliation', 'Members') + return P_('Group chat contact affiliation', 'Member') return '' ===================================== gajim/common/i18n.py ===================================== @@ -122,27 +122,6 @@ def is_rtl_text(text: str) -> bool: return False -def Q_(text: str) -> str: - ''' - Translate the given text, optionally qualified with a special - construction, which will help translators to disambiguate between - same terms, but in different contexts. - - When translated text is returned - this rudimentary construction - will be stripped off, if it's present. - - Here is the construction to use: - Q_("?vcard:Unknown") - - Everything between ? and : - is the qualifier to convey the context - to the translators. Everything after : - is the text itself. - ''' - text = _(text) - if text.startswith('?'): - text = text.split(':', 1)[1] - return text - - def P_(context: str, message: str) -> str: return _translation.pgettext(context, message) ===================================== gajim/gtk/accounts.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import passwords from gajim.common.const import ClientState from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.settings import AllSettingsT from gajim.common import types @@ -522,7 +522,7 @@ def __init__(self, account: str) -> None: self._switch_state_label = Gtk.Label() self._switch_state_label.set_xalign(0) self._switch_state_label.set_valign(Gtk.Align.CENTER) - label_width = max(len(Q_('?switch:On')), len(Q_('?switch:Off'))) + label_width = max(len(P_('Switch', 'On')), len(P_('Switch', 'Off'))) self._switch_state_label.set_width_chars(label_width) self._set_label(account_enabled) @@ -552,7 +552,7 @@ def enable_account(self, state: bool) -> None: self._set_label(state) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = P_('Switch', 'On') if active else P_('Switch', 'Off') self._switch_state_label.set_text(text) def _on_enable_switch(self, ===================================== gajim/gtk/advanced_config.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.setting_values import ADVANCED_SETTINGS from gajim.common.setting_values import APP_SETTINGS @@ -53,9 +53,9 @@ class Column(IntEnum): SETTING_TYPES = { - bool: Q_('?config type:Boolean'), - int: Q_('?config type:Integer'), - str: Q_('?config type:Text'), + bool: P_('Configuration type', 'Boolean'), + int: P_('Configuration type', 'Integer'), + str: P_('Configuration type', 'Text'), } @@ -81,7 +81,7 @@ def __init__(self) -> None: renderer_text = Gtk.CellRendererText() renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) - col = Gtk.TreeViewColumn(Q_('?config:Preference Name'), + col = Gtk.TreeViewColumn(P_('Configuration', 'Preference Name'), renderer_text, text=0) treeview.insert_column(col, -1) col.set_cell_data_func(renderer_text, @@ -94,7 +94,7 @@ def __init__(self) -> None: self.renderer_text.connect('edited', self._on_config_edited) self.renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn( - Q_('?config:Value'), self.renderer_text, text=1) + P_('Configuration', 'Value'), self.renderer_text, text=1) treeview.insert_column(col, -1) col.set_cell_data_func(self.renderer_text, self._value_column_data_callback) @@ -103,7 +103,8 @@ def __init__(self) -> None: col.set_resizable(True) renderer_text = Gtk.CellRendererText() - col = Gtk.TreeViewColumn(Q_('?config:Type'), renderer_text, text=2) + col = Gtk.TreeViewColumn( + P_('Configuration', 'Type'), renderer_text, text=2) treeview.insert_column(col, -1) col.set_sizing(Gtk.TreeViewColumnSizing.FIXED) @@ -159,7 +160,8 @@ def _on_treeview_selection_changed(self, setting = model[iter_][Column.NAME] desc = ADVANCED_SETTINGS['app'][setting] - self._ui.description.set_text(desc or Q_('?config description:None')) + self._ui.description.set_text( + desc or P_('Configuration description', 'None')) self._ui.reset_button.set_sensitive(not model[iter_][Column.IS_DEFAULT]) def _on_treeview_row_activated(self, ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT @@ -155,7 +155,7 @@ def set_receipt_icon_visible(self, visible: bool) -> None: self._marker_image.set_visible(visible) self._marker_image.set_from_icon_name( 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Received')) + self._marker_image.set_tooltip_text(P_('Message state', 'Received')) def set_correction_icon_visible(self, visible: bool) -> None: self._correction_image.set_visible(visible) ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -27,7 +27,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.helpers import open_uri from gajim.common.helpers import get_groupchat_name from gajim.common.const import RFC5646_LANGUAGE_TAGS @@ -40,63 +40,63 @@ MUC_FEATURES = { 'muc_open': ( 'feather-globe-symbolic', - Q_('?Group chat feature:Open'), + P_('Group chat feature', 'Open'), _('Anyone can join this group chat')), 'muc_membersonly': ( 'feather-user-check-symbolic', - Q_('?Group chat feature:Members Only'), + P_('Group chat feature', 'Members Only'), _('This group chat is restricted ' 'to members only')), 'muc_nonanonymous': ( 'feather-shield-off-symbolic', - Q_('?Group chat feature:Not Anonymous'), + P_('Group chat feature', 'Not Anonymous'), _('All other group chat participants ' 'can see your XMPP address')), 'muc_semianonymous': ( 'feather-shield-symbolic', - Q_('?Group chat feature:Semi-Anonymous'), + P_('Group chat feature', 'Semi-Anonymous'), _('Only moderators can see your XMPP address')), 'muc_moderated': ( 'feather-mic-off-symbolic', - Q_('?Group chat feature:Moderated'), + P_('Group chat feature', 'Moderated'), _('Participants entering this group chat need ' 'to request permission to send messages')), 'muc_unmoderated': ( 'feather-mic-symbolic', - Q_('?Group chat feature:Not Moderated'), + P_('Group chat feature', 'Not Moderated'), _('Participants entering this group chat are ' 'allowed to send messages')), 'muc_public': ( 'feather-eye-symbolic', - Q_('?Group chat feature:Public'), + P_('Group chat feature', 'Public'), _('Group chat can be found via search')), 'muc_hidden': ( 'feather-eye-off-symbolic', - Q_('?Group chat feature:Hidden'), + P_('Group chat feature', 'Hidden'), _('This group chat can not be found via search')), 'muc_passwordprotected': ( 'feather-lock-symbolic', - Q_('?Group chat feature:Password Required'), + P_('Group chat feature', 'Password Required'), _('This group chat ' 'does require a password upon entry')), 'muc_unsecured': ( 'feather-unlock-symbolic', - Q_('?Group chat feature:No Password Required'), + P_('Group chat feature', 'No Password Required'), _('This group chat does not require ' 'a password upon entry')), 'muc_persistent': ( 'feather-hard-drive-symbolic', - Q_('?Group chat feature:Persistent'), + P_('Group chat feature', 'Persistent'), _('This group chat persists ' 'even if there are no participants')), 'muc_temporary': ( 'feather-clock-symbolic', - Q_('?Group chat feature:Temporary'), + P_('Group chat feature', 'Temporary'), _('This group chat will be destroyed ' 'once the last participant left')), 'mam': ( 'feather-server-symbolic', - Q_('?Group chat feature:Archiving'), + P_('Group chat feature', 'Archiving'), _('Messages are archived on the server')), } ===================================== gajim/gtk/menus.py ===================================== @@ -39,7 +39,7 @@ from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType from gajim.common.const import XmppUriQuery @@ -617,10 +617,12 @@ def get_chat_row_menu(contact: types.ChatContactT, timestamp_formatted = timestamp.strftime(time_format) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( - (Q_('?Message row action:Copy'), 'win.copy-message', f'"{copy_text}"')) + (P_('Message row action', 'Copy'), + 'win.copy-message', + f'"{copy_text}"')) menu_items.append( - (Q_('?Message row action:Select Messages…'), + (P_('Message row action', 'Select Messages…'), 'win.activate-message-selection', GLib.Variant('u', log_line_id or 0))) @@ -634,7 +636,7 @@ def get_chat_row_menu(contact: types.ChatContactT, show_quote = False if show_quote: menu_items.append(( - Q_('?Message row action:Quote…'), + P_('Message row action', 'Quote…'), 'win.quote', f'"{text}"')) @@ -644,7 +646,7 @@ def get_chat_row_menu(contact: types.ChatContactT, contact, message_id) if show_correction: menu_items.append(( - Q_('?Message row action:Correct…'), 'win.correct-message', None)) + P_('Message row action', 'Correct…'), 'win.correct-message', None)) show_retract = False if isinstance(contact, GroupchatContact) and contact.is_joined: @@ -665,7 +667,9 @@ def get_chat_row_menu(contact: types.ChatContactT, jid=contact.jid, stanza_id=stanza_id) menu_items.append(( - Q_('?Message row action:Retract…'), 'win.retract-message', param)) + P_('Message row action', 'Retract…'), + 'win.retract-message', + param)) menu = GajimMenu.from_list(menu_items) return menu ===================================== gajim/gtk/profile.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.gui.avatar import clip_circle from gajim.gui.avatar_selector import AvatarSelector @@ -49,19 +49,19 @@ log = logging.getLogger('gajim.gui.profile') MENU_DICT = { - 'fn': Q_('?profile:Full Name'), + 'fn': P_('Profile', 'Full Name'), 'bday': _('Birthday'), - 'gender': Q_('?profile:Gender'), - 'adr': Q_('?profile:Address'), + 'gender': P_('Profile', 'Gender'), + 'adr': P_('Profile', 'Address'), 'email': _('Email'), - 'impp': Q_('?profile:IM Address'), + 'impp': P_('Profile', 'IM Address'), 'tel': _('Phone No.'), - 'org': Q_('?profile:Organisation'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), + 'org': P_('Profile', 'Organisation'), + 'title': P_('Profile', 'Title'), + 'role': P_('Profile', 'Role'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), - 'note': Q_('?profile:Note'), + 'key': P_('Profile', 'Public Encryption Key'), + 'note': P_('Profile', 'Note'), } ===================================== gajim/gtk/settings.py ===================================== @@ -34,7 +34,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.setting_values import AllSettingsT from .util import get_image_button @@ -450,7 +450,7 @@ def on_switch(self, switch: Gtk.Switch, *args: Any) -> None: self._set_label(value) def _set_label(self, active: bool) -> None: - text = Q_('?switch:On') if active else Q_('?switch:Off') + text = P_('Switch', 'On') if active else P_('Switch', 'Off') self._switch_state_label.set_text(text) @@ -871,7 +871,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: custom = app.settings.get_account_setting(self.account, 'use_custom_host') - return Q_('?switch:On') if custom else Q_('?switch:Off') + return P_('Switch', 'On') if custom else P_('Switch', 'Off') class ChangePasswordSetting(DialogSetting): @@ -897,7 +897,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoaway') - return Q_('?switch:On') if value else Q_('?switch:Off') + return P_('Switch', 'On') if value else P_('Switch', 'Off') class CutstomAutoExtendedAwaySetting(DialogSetting): @@ -906,7 +906,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('autoxa') - return Q_('?switch:On') if value else Q_('?switch:Off') + return P_('Switch', 'On') if value else P_('Switch', 'Off') class CustomStunServerSetting(DialogSetting): @@ -915,7 +915,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('use_stun_server') - return Q_('?switch:On') if value else Q_('?switch:Off') + return P_('Switch', 'On') if value else P_('Switch', 'Off') class NotificationsSetting(DialogSetting): @@ -924,4 +924,4 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: def get_setting_value(self) -> str: value = app.settings.get('show_notifications') - return Q_('?switch:On') if value else Q_('?switch:Off') + return P_('Switch', 'On') if value else P_('Switch', 'Off') ===================================== gajim/gtk/tooltips.py ===================================== @@ -42,7 +42,7 @@ from gajim.common import types from gajim.common import helpers from gajim.common.const import AvatarSize -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.i18n import _ from gajim.common.file_props import FileProp @@ -316,26 +316,26 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: assert file_prop.tt_account is not None client = app.get_client(file_prop.tt_account) if file_prop.type_ == 'r': - type_ = Q_('?Noun:Download') + type_ = P_('Noun', 'Download') actor = _('Sender: ') sender = JID.from_string(file_prop.sender) name = client.get_module('Contacts').get_contact(sender.bare).name else: - type_ = Q_('?Noun:Upload') + type_ = P_('Noun', 'Upload') actor = _('Recipient: ') receiver = JID.from_string(file_prop.receiver) name = client.get_module('Contacts').get_contact( receiver.bare).name - properties.append((Q_('?transfer type:Type: '), type_)) + properties.append((P_('File transfer type', 'Type: '), type_)) properties.append((actor, GLib.markup_escape_text(name))) transferred_len = file_prop.received_len if not transferred_len: transferred_len = 0 - properties.append((Q_('?transfer status:Transferred: '), + properties.append((P_('File transfer state', 'Transferred: '), GLib.format_size_full(transferred_len, self.units))) status = self._get_current_status(file_prop) - properties.append((Q_('?transfer status:Status: '), status)) + properties.append((P_('File transfer state', 'Status: '), status)) file_desc = file_prop.desc or '' properties.append((_('Description: '), GLib.markup_escape_text(file_desc))) @@ -361,17 +361,17 @@ def _create_tooltip(self, file_prop: FileProp, _sid: str) -> Gtk.Grid: @staticmethod def _get_current_status(file_prop: FileProp) -> str: if file_prop.stopped: - return Q_('?transfer status:Aborted') + return P_('File transfer state', 'Aborted') if file_prop.completed: - return Q_('?transfer status:Completed') + return P_('File transfer state', 'Completed') if file_prop.paused: - return Q_('?transfer status:Paused') + return P_('File transfer state', 'Paused') if file_prop.stalled: # stalled is not paused. it is like 'frozen' it stopped alone - return Q_('?transfer status:Stalled') + return P_('File transfer state', 'Stalled') if file_prop.connected: if file_prop.started: - return Q_('?transfer status:Transferring') - return Q_('?transfer status:Not started') - return Q_('?transfer status:Not started') + return P_('File transfer state', 'Transferring') + return P_('File transfer state', 'Not started') + return P_('File transfer state', 'Not started') ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -25,7 +25,7 @@ from nbxmpp.modules.vcard4 import VCard from gajim.common.i18n import _ -from gajim.common.i18n import Q_ +from gajim.common.i18n import P_ from gajim.common.const import URIType from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri @@ -40,16 +40,16 @@ 'n': _('Name'), 'bday': _('Birthday'), 'gender': _('Gender'), - 'adr': Q_('?profile:Address'), + 'adr': P_('Profile', 'Address'), 'tel': _('Phone No.'), 'email': _('Email'), - 'impp': _('IM Address'), - 'title': Q_('?profile:Title'), - 'role': Q_('?profile:Role'), - 'org': _('Organisation'), - 'note': Q_('?profile:Note'), + 'impp': P_('Profile', 'IM Address'), + 'title': P_('Profile', 'Title'), + 'role': P_('Profile', 'Role'), + 'org': P_('Profile', 'Organisation'), + 'note': P_('Profile', ':Note'), 'url': _('URL'), - 'key': Q_('?profile:Public Encryption Key'), + 'key': P_('Profile', 'Public Encryption Key'), } @@ -118,8 +118,8 @@ SEX_VALUES = { 'M': _('Male'), 'F': _('Female'), - 'O': Q_('?Gender:Other'), - 'N': Q_('?Gender:None'), + 'O': P_('Gender', 'Other'), + 'N': P_('Gender', 'None'), 'U': _('Unknown') } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8db1df894f2b9dc119e0e8e13620dd8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8db1df894f2b9dc119e0e8e13620dd8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch i18n-method-switch
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann pushed new branch i18n-method-switch at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/i18n-method-switch You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch message-replies
by Daniel Brötzmann (＠wurstsalat) 04 Dec '22

04 Dec '22

Daniel Brötzmann pushed new branch message-replies at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/message-replies You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Tests: Fix ruff linter errors
by Philipp Hörist (＠lovetox) 04 Dec '22

04 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48a1b1ff by Philipp Hörist at 2022-12-04T13:22:06+01:00 cq: Tests: Fix ruff linter errors - - - - - 8 changed files: - pyproject.toml - test/gtk/change_password.py - test/gtk/dataform.py - test/gtk/fake_dataform.py - test/gtk/groupchat_info.py - test/gtk/util.py - test/no_gui/test_styling.py - test/no_gui/test_text_helpers.py Changes: ===================================== pyproject.toml ===================================== @@ -164,7 +164,7 @@ select = [ # "D", # pydocstyle "E", # pycodestyle "F", # pyflakes - "FBT", # flake8-boolean-trap + # "FBT", # flake8-boolean-trap # "I", # flake8-tidy-imports, isort "M", # Meta rules "N", # pep8-naming @@ -206,7 +206,8 @@ target-version = "py39" [tool.ruff.per-file-ignores] "test/*" = ["E402"] -"test/no_gui/test_styling.py" = ["RUF001"] +"test/no_gui/test_styling.py" = ["RUF001", "E501"] +"test/no_gui/test_regex.py" = ["RUF001"] [tool.ruff.mccabe] ===================================== test/gtk/change_password.py ===================================== @@ -26,14 +26,15 @@ fields = [ create_field(typ='text-single', label='Username', var='username'), create_field(typ='text-single', label='Old Password', var='old_password'), - create_field(typ='text-single', label='Mothers name', var='mother', required=True), + create_field(typ='text-single', label='Mothers name', + var='mother', required=True), ] form = SimpleDataForm(type_='form', fields=fields) def _apply(self, next_stage=False): if next_stage: - print(self.get_page('next_stage').get_submit_form()) + self.get_page('next_stage').get_submit_form() else: self.get_page('next_stage').set_form(form) self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT) ===================================== test/gtk/dataform.py ===================================== @@ -44,9 +44,9 @@ itner+hRS7W65wJLCJi6kp+XU1MORru7EvVkztO6ln3z4Nh123WLUNDjFUxvXaTcc6nMFcbfP1a9028z9gj2WIWqpqHu9QF/V7/CNxkeFYjA/llf+M3ulV5pdUduNZjoEtZtdLtL65vctPzc0SjmDE3uzL4XwEGaE59Wir0GODyhncVCiWBZ2GCfw2Y3y9MfwfzO5hO2 v8AIg7mWYx8/rwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMTEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggolQTkcNChoKAAAADUlIRFIAAAAoAAAAPAEAAAAAP MLFTQAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAJiS0dEAAHdihOkAAAAB3RJTUUH4gsEFzIsqSs7CAAAABBJREFUGNNj+A8CDKMkjUkAKsYq5D2hXoMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtM -TEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggg==''' +TEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggg==''' # noqa -app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) +app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) # noqa app.css_config = MagicMock() app.css_config.get_value = MagicMock(return_value='rgb(100, 100, 255)') @@ -118,12 +118,12 @@ <required/> </field> </x> -''' +''' # noqa class DataFormWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Data Form Test") + Gtk.Window.__init__(self, title='Data Form Test') self.set_default_size(600, 600) options = { 'left-width': 100, @@ -135,6 +135,6 @@ def __init__(self): self.show() win = DataFormWindow() -win.connect("destroy", Gtk.main_quit) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() ===================================== test/gtk/fake_dataform.py ===================================== @@ -14,7 +14,8 @@ fake_form = { - 'instructions': 'This is the a long long long long long long test instruction', + 'instructions': ('This is the a long long long long long ' + 'long test instruction'), 'username': '', 'nick': '', 'password': '', @@ -41,7 +42,7 @@ class DataFormWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Data Form Test") + Gtk.Window.__init__(self, title='Data Form Test') self.set_default_size(600, 600) self._widget = FakeDataFormWidget(fake_form2) self.add(self._widget) ===================================== test/gtk/groupchat_info.py ===================================== @@ -1,7 +1,5 @@ from unittest.mock import MagicMock -import time - import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk @@ -88,7 +86,7 @@ </field> </x> </query> -</iq>''') +</iq>''') # noqa subject = ('Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed ' ===================================== test/gtk/util.py ===================================== @@ -1,3 +1,4 @@ +import logging from pathlib import Path from gi.repository import Gdk @@ -14,10 +15,10 @@ def get_gajim_dir() -> Path: def load_style(filename: str, priority: CSSPriority) -> None: path = get_gajim_dir() / 'data' / 'style' / filename try: - with open(str(path), 'r', encoding='utf8') as file: + with open(str(path), encoding='utf8') as file: css = file.read() - except Exception as exc: - print(exc) + except Exception: + logging.exception('') return provider = Gtk.CssProvider() provider.load_from_data(bytes(css.encode('utf-8'))) ===================================== test/no_gui/test_styling.py ===================================== @@ -347,7 +347,7 @@ 'http://مثال.إختبار', 'http://例子.测试', 'http://उदाहरण.परीक्षा', - 'http://-.~_!$&\'()*+,;=:%40:80%2f::::::@example.com', + "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com", 'http://1337.net', 'http://a.b-c.de', 'http://223.255.255.254', @@ -530,33 +530,33 @@ def test_uris(self): for uri in URIS: text = self.wrap(uri) hlinks = process_uris(text) - self.assertEqual([l.uri for l in hlinks], [uri], text) + self.assertEqual([link.uri for link in hlinks], [uri], text) def test_invalid_uris(self): for foo in NONURIS + UNACCEPTABLE_URIS: text = self.wrap(foo) hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], [], text) + self.assertEqual([link.text for link in hlinks], [], text) def test_jids(self): for jid in JIDS: text = self.wrap(jid) uri = jid_to_iri(jid) hlinks = process_uris(text) - self.assertEqual([(l.text, l.uri) for l in hlinks], + self.assertEqual([(link.text, link.uri) for link in hlinks], [(jid, uri)], text) def test_nonjids(self): for foo in NONJIDS: text = self.wrap(foo) hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], [], text) + self.assertEqual([link.text for link in hlinks], [], text) def test_uris_with_text(self): for text, results in URIS_WITH_TEXT: hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], results, text) + self.assertEqual([link.text for link in hlinks], results, text) -if __name__ == "__main__": +if __name__ == '__main__': unittest.main() ===================================== test/no_gui/test_text_helpers.py ===================================== @@ -13,7 +13,7 @@ def test_escape_iri_path_segment(self): self.assertEqual( escape_iri_path_segment(''.join(chr(c) for c in range(0x20,0x7F))), - '%20!%22%23$%25&\'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN' + "%20!%22%23$%25&'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN" 'OPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~', 'ASCII printable') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48a1b1ffbb1c071b5d5add9b17d78163… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48a1b1ffbb1c071b5d5add9b17d78163… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Flatpak: Update dependencies
by André (＠andre) 04 Dec '22

04 Dec '22

André pushed to branch master at gajim / gajim Commits: 38fd03ce by André Apitzsch at 2022-12-04T11:58:58+01:00 chore: Flatpak: Update dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -120,22 +120,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-38.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: 194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… + sha256: 50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-38.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… + sha256: a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8 - name: python3-dbus-python build-options: @@ -164,58 +164,68 @@ modules: url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… sha256: f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + # importlib-metadata dependency - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.8.1-py3-none-any.whl + - pip3 install zipp-3.11.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.1-py3-none-any.… - sha256: 47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.11.0-py3-none-any… + sha256: 83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-8.14.0-py3-none-any.whl + - pip3 install more_itertools-9.0.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install importlib_metadata-5.1.0-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313 + - name: python3-jaraco.classes buildsystem: simple build-commands: - - pip3 install jaraco.classes-3.2.2-py3-none-any.whl + - pip3 install jaraco.classes-3.2.3-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/j/jaraco.classes/jaraco.classes… - sha256: e6ef6fd3fcf4579a7a019d87d1e56a883f4e4c35cfe925f86731abc58804e647 + url: https://files.pythonhosted.org/packages/py3/j/jaraco.classes/jaraco.classes… + sha256: 2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158 - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.9.3-py3-none-any.whl + - pip3 install keyring-23.11.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.9.3-py3-no… - sha256: 69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.11.0-py3-n… + sha256: 3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install css_parser-1.0.7-py2.py3-none-any.whl + - pip3 install css_parser-1.0.8-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… - sha256: de7018ec9d3f20f7d692973c37f22ae9a22123c60c77b11849363f47ef6f3387 + url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… + sha256: 8f227506d21e2236f328781d41e055b5665ed2016137567841449035298ce439 - name: python3-precis_i18n buildsystem: simple @@ -241,8 +251,8 @@ modules: - /bin sources: - type: archive - url: https://download.gnome.org/sources/gspell/1.10/gspell-1.10.0.tar.xz - sha256: 803bb884c0215d3fd22a85d7f30423aff88d9792f05a5199d8a489a2ffaae1da + url: https://download.gnome.org/sources/gspell/1.12/gspell-1.12.0.tar.xz + sha256: 40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad - name: farstream rm-configure: true @@ -259,36 +269,36 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.2.0.tar.gz - sha256: 75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.3.0.tar.gz + sha256: c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.12-py2.py3-none-any.whl + - pip3 install urllib3-1.26.13-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.12-p… - sha256: b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.13-p… + sha256: 47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.9.14-py3-none-any.whl + - pip3 install certifi-2022.9.24-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.14-py3… - sha256: e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.24-py3… + sha256: 90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.9.8-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.11.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… - sha256: 7378c08d81da78a4860da7b4900ac51fef38be841d01bc5b7cb249ac51e070c6 + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c # gssapi dependency - name: python3-decorator @@ -307,8 +317,8 @@ modules: - pip3 install -v --no-build-isolation . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.1.tar.gz - sha256: 893aa38ae769d1febe89963aa9f59194a966736ade2263fe14e0081126d64a72 + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.2.tar.gz + sha256: b78e0a021cc91158660e4c5cc9263e07c719346c35a9c0f66725e914b235c89a - name: python3-nbxmpp buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -113,22 +113,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-38.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: 194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… + sha256: 50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-38.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… + sha256: a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8 - name: python3-dbus-python build-options: @@ -157,58 +157,68 @@ modules: url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… sha256: f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + # importlib-metadata dependency - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.8.1-py3-none-any.whl + - pip3 install zipp-3.11.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.8.1-py3-none-any.… - sha256: 47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.11.0-py3-none-any… + sha256: 83a28fcb75844b5c0cdaf5aa4003c2d728c77e05f5aeabe8e95e56727005fbaa # jaraco.classes dependency - name: python3-more-itertools buildsystem: simple build-commands: - - pip3 install more_itertools-8.14.0-py3-none-any.whl + - pip3 install more_itertools-9.0.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… - sha256: 1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2 + url: https://files.pythonhosted.org/packages/py3/m/more_itertools/more_itertools… + sha256: 250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install importlib_metadata-5.1.0-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313 + - name: python3-jaraco.classes buildsystem: simple build-commands: - - pip3 install jaraco.classes-3.2.2-py3-none-any.whl + - pip3 install jaraco.classes-3.2.3-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/j/jaraco.classes/jaraco.classes… - sha256: e6ef6fd3fcf4579a7a019d87d1e56a883f4e4c35cfe925f86731abc58804e647 + url: https://files.pythonhosted.org/packages/py3/j/jaraco.classes/jaraco.classes… + sha256: 2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158 - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.9.3-py3-none-any.whl + - pip3 install keyring-23.11.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.9.3-py3-no… - sha256: 69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.11.0-py3-n… + sha256: 3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install css_parser-1.0.7-py2.py3-none-any.whl + - pip3 install css_parser-1.0.8-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… - sha256: de7018ec9d3f20f7d692973c37f22ae9a22123c60c77b11849363f47ef6f3387 + url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… + sha256: 8f227506d21e2236f328781d41e055b5665ed2016137567841449035298ce439 - name: python3-precis_i18n buildsystem: simple @@ -234,8 +244,8 @@ modules: - /bin sources: - type: archive - url: https://download.gnome.org/sources/gspell/1.10/gspell-1.10.0.tar.xz - sha256: 803bb884c0215d3fd22a85d7f30423aff88d9792f05a5199d8a489a2ffaae1da + url: https://download.gnome.org/sources/gspell/1.12/gspell-1.12.0.tar.xz + sha256: 40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad - name: farstream rm-configure: true @@ -252,36 +262,36 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.2.0.tar.gz - sha256: 75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.3.0.tar.gz + sha256: c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f # sentry-sdk dependency - name: python3-urllib3 buildsystem: simple build-commands: - - pip3 install urllib3-1.26.12-py2.py3-none-any.whl + - pip3 install urllib3-1.26.13-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.12-p… - sha256: b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.13-p… + sha256: 47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.9.14-py3-none-any.whl + - pip3 install certifi-2022.9.24-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.14-py3… - sha256: e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.24-py3… + sha256: 90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.9.8-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.11.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.9… - sha256: 7378c08d81da78a4860da7b4900ac51fef38be841d01bc5b7cb249ac51e070c6 + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c # gssapi dependency - name: python3-decorator @@ -300,8 +310,8 @@ modules: - pip3 install -v --no-build-isolation . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.1.tar.gz - sha256: 893aa38ae769d1febe89963aa9f59194a966736ade2263fe14e0081126d64a72 + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.8.2.tar.gz + sha256: b78e0a021cc91158660e4c5cc9263e07c719346c35a9c0f66725e914b235c89a - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38fd03ce6bb846317289184819401598… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38fd03ce6bb846317289184819401598… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits