diff options
| -rwxr-xr-x | .ci/debian_build.py | 2 | ||||
| -rw-r--r-- | gajim/common/call_manager.py | 2 | ||||
| -rw-r--r-- | gajim/common/modules/bytestream.py | 1 | ||||
| -rw-r--r-- | gajim/common/proxy65_manager.py | 4 | ||||
| -rw-r--r-- | gajim/gtk/control.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/discovery.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/menus.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/server_info.py | 1 | ||||
| -rwxr-xr-x | scripts/get_iana_data.py | 5 |
9 files changed, 6 insertions, 15 deletions
diff --git a/.ci/debian_build.py b/.ci/debian_build.py index 6407a51fd..d112c3e53 100755 --- a/.ci/debian_build.py +++ b/.ci/debian_build.py @@ -61,7 +61,7 @@ def prepare_package_dir(context: ReleaseContext) -> None: log.info('Rename dir to: %s', context.release_name) folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] - folder = folder.rename(context.release_dir) + folder.rename(context.release_dir) log.info('Copy debian folder into release directory') shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') diff --git a/gajim/common/call_manager.py b/gajim/common/call_manager.py index 60dcd9901..fb75a744a 100644 --- a/gajim/common/call_manager.py +++ b/gajim/common/call_manager.py @@ -106,13 +106,11 @@ class CallManager(EventHelper): event.fjid, event.sid) if event.media == 'audio': - content = session.get_content('audio') self._set_jingle_state( 'audio', JingleState.CONNECTED, event.sid) if event.media == 'video': - content = session.get_content('video') self._set_jingle_state( 'video', JingleState.CONNECTED, diff --git a/gajim/common/modules/bytestream.py b/gajim/common/modules/bytestream.py index 1478518b6..d68768328 100644 --- a/gajim/common/modules/bytestream.py +++ b/gajim/common/modules/bytestream.py @@ -597,7 +597,6 @@ class Bytestream(BaseModule): id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') sid = query.getAttr('sid') - file_props = FilesProp.getFileProp(self._account, sid) streamhosts: list[dict[str, Any]] = [] for item in query.getChildren(): if item.getName() == 'streamhost': diff --git a/gajim/common/proxy65_manager.py b/gajim/common/proxy65_manager.py index 4a172490a..ff73bb6e1 100644 --- a/gajim/common/proxy65_manager.py +++ b/gajim/common/proxy65_manager.py @@ -62,9 +62,7 @@ class Proxy65Manager: Start if testit=False, Gajim won't try to resolve it ''' - if proxy in self.proxies: - resolver = self.proxies[proxy] - else: + if proxy not in self.proxies: # proxy is being resolved for the first time resolver = ProxyResolver(proxy, sender_jid, testit) self.proxies[proxy] = resolver diff --git a/gajim/gtk/control.py b/gajim/gtk/control.py index f3583cb09..7f28cdfc0 100644 --- a/gajim/gtk/control.py +++ b/gajim/gtk/control.py @@ -633,8 +633,6 @@ class ChatControl(EventHelper): self._scrolled_view.block_signals(True) - rows: list[HistoryRowT] = [] - messages = self._request_messages(before) event_rows = self._request_events(before) rows = self._sort_request_rows(messages, event_rows, before) diff --git a/gajim/gtk/discovery.py b/gajim/gtk/discovery.py index 2482fa4f1..decc8cd38 100644 --- a/gajim/gtk/discovery.py +++ b/gajim/gtk/discovery.py @@ -416,7 +416,7 @@ class ServicesCache: type='im', name=result.node)] - self._on_agent_info(str(result.jid), result.node, result.identities, + self._on_agent_info(str(result.jid), result.node, identities, result.features, result.dataforms) def _disco_info_error(self, result): diff --git a/gajim/gtk/menus.py b/gajim/gtk/menus.py index c9422a722..78ecb9055 100644 --- a/gajim/gtk/menus.py +++ b/gajim/gtk/menus.py @@ -594,7 +594,7 @@ def get_groupchat_mod_menu(self_contact: types.GroupchatParticipant, value = GLib.Variant('as', [contact_name, 'participant']) menu.add_item(_('Grant Voice'), action, value) else: - value = value = GLib.Variant('as', [contact_name, 'visitor']) + value = GLib.Variant('as', [contact_name, 'visitor']) menu.add_item(_('Revoke Voice'), action, value) if not menu.get_n_items(): diff --git a/gajim/gtk/server_info.py b/gajim/gtk/server_info.py index 676b8dfdf..289b224cd 100644 --- a/gajim/gtk/server_info.py +++ b/gajim/gtk/server_info.py @@ -151,7 +151,6 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): tls_version = TLS_VERSION_STRINGS.get(nbxmpp_client.tls_version) self._ui.tls_version.set_text(tls_version or _('Not available')) - visible = nbxmpp_client.ciphersuite is not None self._ui.cipher_suite.set_text(nbxmpp_client.ciphersuite or _('Not available')) diff --git a/scripts/get_iana_data.py b/scripts/get_iana_data.py index f576ccb26..d7e74cc95 100755 --- a/scripts/get_iana_data.py +++ b/scripts/get_iana_data.py @@ -40,7 +40,7 @@ def parse_uri_schemes(content: str) -> list[str]: def generate_output(schemes: list[str], - out_path: Path): + outpath: Path) -> None: logging.info('Generate output') current_date = datetime.utcnow().isoformat() @@ -68,6 +68,5 @@ if __name__ == '__main__': scheme_content = download_file(SCHEMES_URL) schemes = parse_uri_schemes(scheme_content) - output = generate_output(schemes, - outpath) + generate_output(schemes, outpath) logging.info('Finished !') |