Philipp Hörist pushed to branch master at gajim / gajim
Commits: 2a43353c by mesonium at 2023-01-07T12:34:48+00:00 cq: Cleanup unused local variables
- Remove never used variables - Try to incorporate declared but not used variable where it seemed to be in the author's original intention
- - - - -
9 changed files:
- .ci/debian_build.py - gajim/common/call_manager.py - gajim/common/modules/bytestream.py - gajim/common/proxy65_manager.py - gajim/gtk/control.py - gajim/gtk/discovery.py - gajim/gtk/menus.py - gajim/gtk/server_info.py - scripts/get_iana_data.py
Changes:
===================================== .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')
===================================== gajim/common/call_manager.py ===================================== @@ -106,13 +106,11 @@ def _on_jingle_connected(self, 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,
===================================== gajim/common/modules/bytestream.py ===================================== @@ -597,7 +597,6 @@ def _on_bytestream_set(self, 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':
===================================== gajim/common/proxy65_manager.py ===================================== @@ -62,9 +62,7 @@ def resolve(self, proxy, connection, sender_jid, default=None, 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
===================================== gajim/gtk/control.py ===================================== @@ -633,8 +633,6 @@ def _request_history(self,
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)
===================================== gajim/gtk/discovery.py ===================================== @@ -416,7 +416,7 @@ def _disco_info_received(self, task): 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):
===================================== 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():
===================================== gajim/gtk/server_info.py ===================================== @@ -151,7 +151,6 @@ def _add_connection_info(self) -> None: 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'))
===================================== 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 @@ def generate_output(schemes: list[str],
scheme_content = download_file(SCHEMES_URL) schemes = parse_uri_schemes(scheme_content) - output = generate_output(schemes, - outpath) + generate_output(schemes, outpath) logging.info('Finished !')
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a43353ca247f1250edffc01dd124d6c4...