Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Name action correctly
by Philipp Hörist (＠lovetox) 19 Jun '22

19 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9914c246 by lovetox at 2022-06-19T15:46:47+02:00 fix: Name action correctly - - - - - 1 changed file: - gajim/data/other/shortcuts.json Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -31,5 +31,5 @@ "win.switch-tab-8": ["<Alt>8", "<Alt>KP_8"], "win.switch-tab-9": ["<Alt>9", "<Alt>KP_9"], "win.search-history": ["<Primary>H"], - "win.hide-chat-list": ["<Primary>R"] + "win.toggle-chat-list": ["<Primary>R"] } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9914c246090155bf1f8daba85424b3c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9914c246090155bf1f8daba85424b3c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Main: Process window shortcuts when no chat is open
by Philipp Hörist (＠lovetox) 19 Jun '22

19 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94739a89 by lovetox at 2022-06-19T14:20:25+02:00 fix: Main: Process window shortcuts when no chat is open - - - - - f11514ad by lovetox at 2022-06-19T14:22:29+02:00 feat: Add new Shortcut for toggling the chat list <Primary>R show/hides the chat list - - - - - 4 changed files: - gajim/data/gui/shortcuts_window.ui - gajim/data/other/shortcuts.json - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -175,6 +175,13 @@ <object class="GtkShortcutsGroup"> <property name="visible">1</property> <property name="title" translatable="yes">Tabs</property> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary>R</property> + <property name="title" translatable="yes">Toggle Chat List</property> + </object> + </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> ===================================== gajim/data/other/shortcuts.json ===================================== @@ -30,5 +30,6 @@ "win.switch-tab-7": ["<Alt>7", "<Alt>KP_7"], "win.switch-tab-8": ["<Alt>8", "<Alt>KP_8"], "win.switch-tab-9": ["<Alt>9", "<Alt>KP_9"], - "win.search-history": ["<Primary>H"] + "win.search-history": ["<Primary>H"], + "win.hide-chat-list": ["<Primary>R"] } ===================================== gajim/gtk/chat_page.py ===================================== @@ -313,3 +313,8 @@ def hide_search(self) -> bool: self._search_revealer.set_reveal_child(False) return True return False + + def toggle_chat_list(self) -> None: + chat_list = self._ui.paned.get_child1() + assert chat_list is not None + chat_list.set_visible(not chat_list.get_visible()) ===================================== gajim/gtk/main.py ===================================== @@ -343,6 +343,7 @@ def _add_actions2(self) -> None: 'switch-tab-7', 'switch-tab-8', 'switch-tab-9', + 'toggle-chat-list', ] disabled_for_emacs = ( @@ -363,31 +364,31 @@ def _on_action(self, action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> Optional[int]: - control = self.get_active_control() - if control is None: + action_name = action.get_name() + log.info('Activate action: %s', action_name) + + if action_name == 'escape' and self._chat_page.hide_search(): return None - log.info('Activate action: %s, active control: %s', - action.get_name(), control.contact.jid) - action_name = action.get_name() + control = self.get_active_control() + if control is not None: - res = control.delegate_action(action_name) - if res != Gdk.EVENT_PROPAGATE: - return res + res = control.delegate_action(action_name) + if res != Gdk.EVENT_PROPAGATE: + return res - if action_name == 'escape': - if self._chat_page.hide_search(): - return None + if action_name == 'escape': + if app.settings.get('escape_key_closes'): + self._chat_page.remove_chat(control.account, + control.contact.jid) + return None - if app.settings.get('escape_key_closes'): + elif action_name == 'close-tab': self._chat_page.remove_chat(control.account, control.contact.jid) return None - elif action_name == 'close-tab': - self._chat_page.remove_chat(control.account, control.contact.jid) - - elif action_name == 'switch-next-tab': + if action_name == 'switch-next-tab': self.select_next_chat(Direction.NEXT) elif action_name == 'switch-prev-tab': @@ -403,6 +404,9 @@ def _on_action(self, number = int(action_name[-1]) - 1 self.select_chat_number(number) + elif action_name == 'toggle-chat-list': + self._chat_page.toggle_chat_list() + return None def _on_window_motion_notify(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3599cbc014b00ced6d8615a8b61825f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3599cbc014b00ced6d8615a8b61825f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update pylintrc
by Philipp Hörist (＠lovetox) 19 Jun '22

19 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3599cbc0 by lovetox at 2022-06-19T13:07:45+02:00 ci: Update pylintrc - - - - - 1 changed file: - pylintrc Changes: ===================================== pylintrc ===================================== @@ -207,7 +207,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib. # (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 +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. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3599cbc014b00ced6d8615a8b61825f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3599cbc014b00ced6d8615a8b61825f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: chore: Fix pylint errors
by Philipp Hörist (＠lovetox) 19 Jun '22

19 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e808b73b by lovetox at 2022-06-19T12:52:39+02:00 chore: Fix pylint errors - - - - - 666d92df by lovetox at 2022-06-19T12:52:39+02:00 ci: Update pylint checks - - - - - a9d9c7dd by lovetox at 2022-06-19T12:53:58+02:00 chore: Remove unused file - - - - - 12 changed files: - .ci/pylint.sh - gajim/command_system/framework.py - gajim/common/app.py - gajim/common/i18n.py - gajim/common/idle.py - gajim/common/proxy65_manager.py - gajim/common/socks5.py - gajim/gtk/chat_list.py - gajim/gtk/search_view.py - gajim/gtk/xml_console.py - − mypy.ini - pylintrc Changes: ===================================== .ci/pylint.sh ===================================== @@ -5,86 +5,20 @@ set -e PYLINT=${PYLINT:-pylint} -# Errors which are covered by pyright -# -# 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 - -IGNORE_FLAKE8='C0301,W0611' - -IGNORE_PYRIGHT='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' - -IGNORE_ALWAYS='R0801,C0209,W0237,W0707,R1732,W1404,W1406,R1725' - -IGNORE_ERRORS=C0103,C0302,C0301,C0330,C0411,C0415,E0401,E0611,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0221,W0223,W0231,W0233,W0603,W0613 - -IGNORE_GTK_MODULE_ERRORS=C0103,C0301,C0330,C0415,E0401,E0611,R0201,R0904,R0915,R1710,W0201,W0233,W0221,W0613 - -"$PYLINT" --version - -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,$IGNORE_ERRORS" --ignore=modules,dbus,gtk "$@" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,$IGNORE_GTK_MODULE_ERRORS" "$@/gtk" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8,E0401,C0415" "$@/common/modules" -"$PYLINT" --disable="$IGNORE_PYRIGHT,$IGNORE_ALWAYS,$IGNORE_FLAKE8," "$@/common/dbus" +# Ignore but need fixing # C0103 invalid-name -# C0209 use-f-string -# C0301 line-too-long -# C0302 too-many-lines -# C0330 bad-continuation # C0415 import-outside-toplevel -# E0401 import-error -# E0611 no-name-in-module -# R0201 no-self-use -# R0801 duplicat-code -# R0901 too-many-ancestors -# R0904 too-many-public-methods -# R0913 too-many-arguments -# R0912 too-many-branches -# R0914 too-many-locals -# R0915 too-many-statements -# R0916 too-many-boolean-expressions -# R1702 too-many-nested-blocks # R1710 inconsistent-return-statements -# R1732 consider-using-with -# R1725 super-with-arguments # W0201 attribute-defined-outside-init # W0221 arguments-differ -# W0223 abstract-method -# W0231 super-init-not-called # W0233 non-parent-init-called -# W0237 arguments-renamed -# W0603 global-statement # W0613 unused-argument -# W0707 raise-missing-from -# W1404 implicit-str-concat -# W1406 redundant-u-string-prefix + +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" ===================================== gajim/command_system/framework.py ===================================== @@ -149,7 +149,7 @@ def get_command(self, name): def list_commands(self): commands = list_commands(self.COMMAND_HOST) commands = dict(commands) - return sorted(set(commands.values()), key=lambda k: k.__repr__()) + return sorted(set(commands.values()), key=repr) class Command: ===================================== gajim/common/app.py ===================================== @@ -233,7 +233,7 @@ def detect_dependencies() -> None: try: gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd - global gupnp_igd + global gupnp_igd # pylint: disable=global-statement gupnp_igd = GUPnPIgd.SimpleIgd() _dependencies['UPNP'] = True except ValueError: @@ -251,7 +251,7 @@ def detect_dependencies() -> None: try: gi.require_version('GSound', '1.0') from gi.repository import GSound - global gsound_ctx + global gsound_ctx # pylint: disable=global-statement gsound_ctx = GSound.Context() try: gsound_ctx.init() @@ -583,7 +583,7 @@ def prefers_app_menu() -> bool: def load_css_config() -> None: - global css_config + global css_config # pylint: disable=global-statement from gajim.gui.css_config import CSSConfig css_config = CSSConfig() ===================================== gajim/common/i18n.py ===================================== @@ -111,7 +111,7 @@ def get_short_lang_code(lang: Optional[str] = None) -> str: def initialize_direction_mark() -> None: from gi.repository import Gtk - global direction_mark + global direction_mark # pylint: disable=global-statement if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL: direction_mark = '\u200F' ===================================== gajim/common/idle.py ===================================== @@ -218,6 +218,7 @@ def set_extended_away(self, state: bool) -> None: class Windows(IdleMonitor): def __init__(self) -> None: + IdleMonitor.__init__(self) self.OpenInputDesktop = ctypes.windll.user32.OpenInputDesktop self.CloseDesktop = ctypes.windll.user32.CloseDesktop self.SystemParametersInfo = ctypes.windll.user32.SystemParametersInfoW ===================================== gajim/common/proxy65_manager.py ===================================== @@ -261,6 +261,7 @@ def __init__(self, Calls on_success, or on_failure according to the result. """ + IdleObject.__init__(self) self.host = host self.port = port self.jid = jid @@ -389,6 +390,7 @@ def __init__(self, Call on_success, or on_failure according to the result. """ + IdleObject.__init__(self) self.host = host self.port = port self.jid = jid ===================================== gajim/common/socks5.py ===================================== @@ -341,7 +341,7 @@ def isHashInSockObjs(self, sockobjs, hash_): return False def on_connection_accepted(self, sock, listener): - sock_hash = sock.__hash__() + sock_hash = hash(sock) if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, @@ -944,6 +944,7 @@ class Socks5Sender(IdleObject): """ def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, port=None, fingerprint=None, connected=True, file_props=None): + IdleObject.__init__(self) self.fingerprint = fingerprint self.queue_idx = sock_hash self.queue = parent @@ -1028,6 +1029,7 @@ def __init__(self, idlequeue, streamhost, sid, file_props=None, fingerprint: fingerprint of certificates we shall use, set to None if TLS connection not desired """ + IdleObject.__init__(self) self.queue_idx = -1 self.streamhost = streamhost self.queue = None @@ -1407,6 +1409,7 @@ def __init__(self, idlequeue, port, fp, fingerprint=None): fingerprint: fingerprint of certificates we shall use, set to None if TLS connection not desired """ + IdleObject.__init__(self) self.port = port self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC, socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) ===================================== gajim/gtk/chat_list.py ===================================== @@ -108,7 +108,7 @@ def workspace_id(self) -> str: return self._workspace_id def get_unread_count(self) -> int: - return sum([chats.unread_count for chats in self._chats.values()]) + return sum(chats.unread_count for chats in self._chats.values()) def get_chat_unread_count(self, account: str, ===================================== gajim/gtk/search_view.py ===================================== @@ -127,8 +127,8 @@ def _on_search(self, entry: Gtk.Entry) -> None: text, before_filters = self._strip_filters(text, 'before') if before_filters is not None: try: - before_filters = min([datetime.fromisoformat(date) for - date in before_filters]) + before_filters = min(datetime.fromisoformat(date) for + date in before_filters) except ValueError: self._ui.date_hint.show() return @@ -137,8 +137,8 @@ def _on_search(self, entry: Gtk.Entry) -> None: text, after_filters = self._strip_filters(text, 'after') if after_filters is not None: try: - after_filters = min([datetime.fromisoformat(date) for - date in after_filters]) + after_filters = min(datetime.fromisoformat(date) for + date in after_filters) # if only the day is specified, we want to look after the # end of that day. # if precision is increased,we do want to look during the ===================================== gajim/gtk/xml_console.py ===================================== @@ -415,6 +415,7 @@ def _print_stanza(self, stanza = event.stanza if not isinstance(stanza, str): + # pylint: disable=unnecessary-dunder-call stanza = stanza.__str__(fancy=True) if not stanza: ===================================== mypy.ini deleted ===================================== @@ -1,65 +0,0 @@ -[mypy] -python_version = 3.9 -warn_unused_configs = True -disallow_incomplete_defs = True -allow_redefinition = True - -[mypy-dbus.*] -ignore_missing_imports = True - -[mypy-win32file.*] -ignore_missing_imports = True - -[mypy-win32con.*] -ignore_missing_imports = True - -[mypy-pywintypes.*] -ignore_missing_imports = True - -[mypy-OpenSSL.*] -ignore_missing_imports = True - -[mypy-encodings.*] -ignore_missing_imports = True - -[mypy-precis_i18n.*] -ignore_missing_imports = True - -[mypy-winsound.*] -ignore_missing_imports = True - -[mypy-PIL.*] -ignore_missing_imports = True - -[mypy-netifaces.*] -ignore_missing_imports = True - -[mypy-keyring.*] -ignore_missing_imports = True - -[mypy-ossaudiodev.*] -ignore_missing_imports = True - -[mypy-css_parser.*] -ignore_missing_imports = True - -[mypy-distro.*] -ignore_missing_imports = True - -[mypy-IPython.*] -ignore_missing_imports = True - -[mypy-traitlets.*] -ignore_missing_imports = True - -[mypy-pygments.*] -ignore_missing_imports = True - -[mypy-cairo.*] -ignore_missing_imports = True - -[mypy-packaging.version.*] -ignore_missing_imports = True - -[mypy-gajim.gui.*] -ignore_missing_imports = True ===================================== pylintrc ===================================== @@ -7,7 +7,7 @@ extension-pkg-whitelist= # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=CVS +ignore=gui # Add files or directories matching the regex patterns to the blacklist. The # regex matches against base names, not paths. @@ -50,12 +50,70 @@ confidence= # --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 # -# Most errors here are disabled because they are covered by pyright # C0111 missing-docstring +# C0209 use-f-string +# C0302 too-many-lines +# 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 -# -disable=C0111,W0511,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 +# 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,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 @@ -149,7 +207,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib. # (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,gajim.gui,cairo +ignored-modules=gi.repository,cairo # Show a hint with possible names when a member name was not found. The aspect # of finding the hint is based on edit distance. @@ -230,12 +288,6 @@ max-line-length=80 # Maximum number of lines in a module max-module-lines=3000 -# List of optional constructs for which whitespace checking is disabled. `dict- -# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. -# `trailing-comma` allows a space between comma and closing bracket: (a, ). -# `empty-line` allows space-only lines. -no-space-check=trailing-comma,dict-separator - # 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 @@ -243,36 +295,21 @@ single-line-if-stmt=no [BASIC] -# Naming hint for argument names -argument-name-hint=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct argument names argument-rgx=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ -# Naming hint for attribute names -attr-name-hint=(([a-z][a-z0-9_]{2,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 -# Naming hint for class attribute names -class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - # Regular expression matching correct class attribute names class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ -# Naming hint for class names -class-name-hint=[A-Z_][a-zA-Z0-9]+$ - # Regular expression matching correct class names class-rgx=[A-Z_][a-zA-Z0-9]+$ -# Naming hint for constant names -const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - # Regular expression matching correct constant names const-rgx= @@ -280,9 +317,6 @@ const-rgx= # ones are exempt. docstring-min-length=-1 -# Naming hint for function names -function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct function names function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ @@ -292,21 +326,12 @@ good-names=i,j,k,ex,Run,_,iq # Include a hint for the correct naming format with invalid-name include-naming-hint=no -# Naming hint for inline iteration names -inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ - # Regular expression matching correct inline iteration names inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ -# Naming hint for method names -method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct method names method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ -# Naming hint for module names -module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - # Regular expression matching correct module names module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ @@ -322,9 +347,6 @@ no-docstring-rgx=^_ # to this list to register other decorators that produce valid properties. property-classes=abc.abstractproperty -# Naming hint for variable names -variable-name-hint=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ - # Regular expression matching correct variable names variable-rgx=(([a-z][a-z0-9_]{1,30})|(_[a-z0-9_]*))$ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8a6c2a26b83f28ec809f166862c585… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8a6c2a26b83f28ec809f166862c585… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ci: Use flake8 for unused-import check
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6db439ca by lovetox at 2022-06-18T15:47:27+02:00 ci: Use flake8 for unused-import check - - - - - a06e0ab3 by lovetox at 2022-06-18T15:52:06+02:00 chore: Fix codestyle errors - - - - - c8a6c2a2 by lovetox at 2022-06-18T15:52:52+02:00 ci: Don’t allow flake8 test to fail - - - - - 10 changed files: - .ci/pylint.sh - .gitlab-ci.yml - gajim/command_system/dispatcher.py - gajim/common/app.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/types.py - gajim/gtk/controls/base.py - gajim/gtk/roster_item_exchange.py - gajim/gtk/status_icon.py Changes: ===================================== .ci/pylint.sh ===================================== @@ -39,7 +39,7 @@ PYLINT=${PYLINT:-pylint} # W1115 non-str-assignment-to-dunder-name # W1116 isinstance-second-argument-not-valid-type -IGNORE_FLAKE8='C0301' +IGNORE_FLAKE8='C0301,W0611' IGNORE_PYRIGHT='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' ===================================== .gitlab-ci.yml ===================================== @@ -35,7 +35,6 @@ test-pyright: test-flake8: stage: test - allow_failure: true rules: - changes: - "**/*.py" ===================================== gajim/command_system/dispatcher.py ===================================== @@ -31,13 +31,12 @@ over the process. """ -from typing import Any # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import +from typing import Any from gajim.command_system.tools import remove -COMMANDS = {} # type: Dict[Any, Any] -CONTAINERS = {} # type: Dict[Any, Any] +COMMANDS: dict[Any, Any] = {} +CONTAINERS: dict[Any, Any] = {} def add_host(host): ===================================== gajim/common/app.py ===================================== @@ -197,7 +197,7 @@ def detect_dependencies() -> None: gi.require_version('Gst', '1.0') gi.require_version('GstPbutils', '1.0') from gi.repository import Gst - from gi.repository import GstPbutils # pylint: disable=unused-import + from gi.repository import GstPbutils # noqa: F401 success, _argv = Gst.init_check(None) _dependencies['GST'] = success except Exception: @@ -224,7 +224,7 @@ def detect_dependencies() -> None: # GEOCLUE try: gi.require_version('Geoclue', '2.0') - from gi.repository import Geoclue # pylint: disable=unused-import + from gi.repository import Geoclue # noqa: F401 _dependencies['GEOCLUE'] = True except (ImportError, ValueError): pass @@ -277,21 +277,21 @@ def detect_dependencies() -> None: # APPINDICATOR try: gi.require_version('AppIndicator3', '0.1') - from gi.repository import AppIndicator3 # pylint: disable=unused-import + from gi.repository import AppIndicator3 # noqa: F401 _dependencies['APPINDICATOR'] = True except (ImportError, ValueError): pass # AYATANA APPINDICATOR try: gi.require_version('AyatanaAppIndicator3', '0.1') - from gi.repository import AyatanaAppIndicator3 # pylint: disable=unused-import + from gi.repository import AyatanaAppIndicator3 # noqa: F401 _dependencies['AYATANA_APPINDICATOR'] = True except (ImportError, ValueError): pass # SENTRY SDK try: - import sentry_sdk # pylint: disable=unused-import + import sentry_sdk # noqa: F401 _dependencies['SENTRY_SDK'] = True except ImportError: pass ===================================== gajim/common/config.py ===================================== @@ -27,10 +27,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Any # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import -from typing import Tuple # pylint: disable=unused-import +from typing import Any import re import copy @@ -63,7 +60,7 @@ class Config: DEFAULT_MOOD_ICONSET = 'default' DEFAULT_ACTIVITY_ICONSET = 'default' - __options = ({ + __options: tuple[dict[str, list[Any]], dict[Any, Any]] = ({ # name: [ type, default_value, help_string, restart ] 'autopopup': [opt_bool, False], 'autopopupaway': [opt_bool, False], @@ -208,9 +205,10 @@ class Config: 'check_for_update': [opt_bool, True, 'Check for Gajim updates periodically'], 'last_update_check': [opt_str, '', 'Date of the last update check'], 'always_ask_for_status_message': [opt_bool, False], - }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] + }, {}) - __options_per_key = { + __options_per_key: dict[str, + tuple[dict[str, list[Any]], dict[Any, Any]]] = { 'accounts': ({ 'name': [opt_str, '', '', True], 'account_label': [opt_str, '', '', False], @@ -314,7 +312,7 @@ class Config: 'plugins': ({ 'active': [opt_bool, False, 'If enabled, plugins will be activated on startup (this is saved when exiting Gajim). This option SHOULD NOT be used to (de)activate plugins. Use the plugin window instead.'], }, {}), - } # type: Dict[str, Tuple[Dict[str, List[Any]], Dict[Any, Any]]] + } statusmsg_default = { 'Sleeping': ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], ===================================== gajim/common/helpers.py ===================================== @@ -81,7 +81,7 @@ from gi.repository import GObject from gi.repository import Soup -import precis_i18n.codec # pylint: disable=unused-import # noqa: F401 +import precis_i18n.codec # noqa: F401 from gajim.common import app from gajim.common import configpaths ===================================== gajim/common/types.py ===================================== @@ -32,7 +32,6 @@ from nbxmpp.structs import BookmarkData if TYPE_CHECKING: - # pylint: disable=unused-import from gajim.common.client import Client from nbxmpp.client import Client as xmppClient # noqa: F401 from gajim.common.modules.contacts import CommonContact # noqa: F401 ===================================== gajim/gtk/controls/base.py ===================================== @@ -89,10 +89,8 @@ # module, but still they need to be kept around. Importing them automatically # registers the contained CommandContainers with the command system, thereby # populating the list of available commands. -# pylint: disable=unused-import from gajim.command_system.implementation import standard # noqa: F401 from gajim.command_system.implementation import execute # noqa: F401 -# pylint: enable=unused-import if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -216,8 +216,8 @@ def _on_accept_button_clicked(self, _button: Gtk.Button) -> None: groups = [] jid = model[iter_][1] if app.jid_is_transport(str(self._jid_from)): - self._client.get_module('Presence').automatically_added.append( - jid) + self._client.get_module('Presence')\ + .automatically_added.append(jid) self._client.get_module('Presence').subscribe( jid, ===================================== gajim/gtk/status_icon.py ===================================== @@ -45,10 +45,12 @@ from .util import open_window if app.is_installed('APPINDICATOR'): - from gi.repository import AppIndicator3 as appindicator # pylint: disable=ungrouped-imports + # pylint: disable=ungrouped-imports + from gi.repository import AppIndicator3 as appindicator elif app.is_installed('AYATANA_APPINDICATOR'): - from gi.repository import AyatanaAppIndicator3 as appindicator # pylint: disable=ungrouped-imports + # pylint: disable=ungrouped-imports + from gi.repository import AyatanaAppIndicator3 as appindicator log = logging.getLogger('gajim.gui.statusicon') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/910a9109f3e9e9f419ef05597cf04e3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/910a9109f3e9e9f419ef05597cf04e3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Discovery: Remove obsolete code
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a3065bc5 by lovetox at 2022-06-18T15:29:00+02:00 fix: Discovery: Remove obsolete code - - - - - 910a9109 by lovetox at 2022-06-18T15:29:25+02:00 fix: Restore minimal AdHoc module - - - - - 2 changed files: - + gajim/common/modules/adhoc_commands.py - gajim/common/modules/discovery.py Changes: ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -0,0 +1,30 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from gajim.common import types +from gajim.common.modules.base import BaseModule + + +class AdHocCommands(BaseModule): + + _nbxmpp_extends = 'AdHoc' + _nbxmpp_methods = [ + 'request_command_list', + 'execute_command', + ] + + def __init__(self, con: types.Client) -> None: + BaseModule.__init__(self, con) ===================================== gajim/common/modules/discovery.py ===================================== @@ -185,19 +185,12 @@ def _answer_disco_items(self, from_ = stanza.getFrom() self._log.info('Answer disco items to %s', from_) - if self._con.get_module('AdHocCommands').command_items_query(stanza): - raise nbxmpp.NodeProcessed - node = stanza.getTagAttr('query', 'node') if node is None: result = stanza.buildReply('result') self._con.connection.send(result) raise nbxmpp.NodeProcessed - if node == Namespace.COMMANDS: - self._con.get_module('AdHocCommands').command_list_query(stanza) - raise nbxmpp.NodeProcessed - def _answer_disco_info(self, _con: types.xmppClient, stanza: Iq, @@ -209,9 +202,6 @@ def _answer_disco_info(self, # Service that echos all stanzas, ignore it raise nbxmpp.NodeProcessed - if self._con.get_module('AdHocCommands').command_info_query(stanza): - raise nbxmpp.NodeProcessed - @as_task def disco_muc(self, jid: Union[JID, str], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4648f0bbbc3920bdac5dae36a826de8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4648f0bbbc3920bdac5dae36a826de8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Fix codestyle errors
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4648f0bb by lovetox at 2022-06-18T15:05:24+02:00 chore: Fix codestyle errors - - - - - 30 changed files: - gajim/common/call_manager.py - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/dbus/location.py - gajim/common/file_props.py - gajim/common/helpers.py - gajim/common/idle.py - gajim/common/jingle_content.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/logging_helpers.py - gajim/common/modules/blocking.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/mam.py - gajim/common/modules/ping.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/security_labels.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/multimedia_helpers.py - gajim/common/proxy65_manager.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/common/styling.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4648f0bbbc3920bdac5dae36a826de8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4648f0bbbc3920bdac5dae36a826de8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Allow deploy-flatpak to fail
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6aec513a by lovetox at 2022-06-18T10:00:11+02:00 ci: Allow deploy-flatpak to fail Until we can setup the deploy key - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -124,6 +124,7 @@ deploy-linux: deploy-flatpak: image: git-deploy:latest stage: deploy + allow_failure: true needs: [] rules: - if: '$CI_COMMIT_TAG' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6aec513a4f593c583e1b19797d7b7735… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6aec513a4f593c583e1b19797d7b7735… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add new changelog tag
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6feecebc by lovetox at 2022-06-18T09:36:34+02:00 chore: Add new changelog tag - - - - - 3 changed files: - .chglog/config.yml - .githooks/update - CONTRIBUTING.md Changes: ===================================== .chglog/config.yml ===================================== @@ -8,19 +8,22 @@ options: filters: Type: - feat + - imprv + - change - perf - fix - - imprv commit_groups: sort_by: Custom title_order: - feat - imprv + - change - perf - fix title_maps: feat: New imprv: Improvements + change: Change perf: Performance fix: Bug Fixes header: ===================================== .githooks/update ===================================== @@ -16,6 +16,7 @@ ALLOWED_TAGS = [ 'perf', 'refactor', 'chore', + 'change', 'release', 'other', 'imprv', ===================================== CONTRIBUTING.md ===================================== @@ -35,12 +35,13 @@ # Commit Messages Every commit message must be prefixed with one of the following tags: - ci (ci related changes) -- feat (functionality of the application was changed) +- feat (a new feature was added) - fix (something was fixed) - perf (performance related changes) - imprv (improvements) - refactor (code was changed, but the end user will not notice) - chore (reoccuring tasks which need to be done) +- change (existing functionality was changed) - release (only used for release commits) - other View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6feecebc6cc08df66e72f846f8015f77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6feecebc6cc08df66e72f846f8015f77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.4.4
by Philipp Hörist (＠lovetox) 18 Jun '22

18 Jun '22

Philipp Hörist pushed new tag 1.4.4 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.4.4 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