Commits September 2018

commits@gajim.org

1 participants
100 discussions

[Git][gajim/gajim][master] 4 commits: fuzzyclock: Fix pylint errors
by Philipp Hörist 13 Sep '18

13 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62c54525 by Philipp Hörist at 2018-09-12T22:33:54Z fuzzyclock: Fix pylint errors - - - - - 58a3b830 by Philipp Hörist at 2018-09-13T17:59:03Z Update mypy.ini - - - - - a62f348a by Philipp Hörist at 2018-09-13T21:54:29Z Add stubs file for emoji_data Otherwise mypy hangs because the file is to big - - - - - d54d4bc2 by Philipp Hörist at 2018-09-13T21:56:12Z Add annotations and fix pylint/mypy errors - - - - - 30 changed files: - gajim/application.py - gajim/chat_control.py - gajim/command_system/dispatcher.py - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/execute.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/dbus_support.py - gajim/common/fuzzyclock.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/modules/__init__.py - gajim/common/modules/annotations.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/nec.py - gajim/common/pep.py - + gajim/common/types.py - gajim/dialog_messages.py - gajim/dialogs.py - gajim/disco.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/64aec8adcef02a26e372da2e920f154cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/64aec8adcef02a26e372da2e920f154cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 12 Sep '18

12 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ee254d25 by Philipp Hörist at 2018-09-12T19:08:37Z Fix pylint errors - - - - - 64aec8ad by Philipp Hörist at 2018-09-12T19:08:37Z Add annotations - - - - - 7 changed files: - gajim/adhoc_commands.py - gajim/command_system/dispatcher.py - gajim/command_system/framework.py - gajim/common/modules/annotations.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/ping.py Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -60,6 +60,7 @@ class CommandWindow: self.stage_back_button_cb = None self.stage_forward_button_cb = None self.stage_execute_button_cb = None + self.stage_finish_button_cb = None self.stage_close_button_cb = None self.stage_restart_button_cb = None self.stage_window_delete_cb = None ===================================== gajim/command_system/dispatcher.py ===================================== --- a/gajim/command_system/dispatcher.py +++ b/gajim/command_system/dispatcher.py @@ -88,7 +88,7 @@ def list_commands(host): yield name, command class Dispatchable(type): - + # pylint: disable=no-value-for-parameter def __init__(self, name, bases, namespace): parents = super(Dispatchable, self) parents.__init__(name, bases, namespace) ===================================== gajim/command_system/framework.py ===================================== --- a/gajim/command_system/framework.py +++ b/gajim/command_system/framework.py @@ -75,6 +75,7 @@ class CommandProcessor(object): Try to process text as a command. Returns True if it has been processed as a command and False otherwise. """ + # pylint: disable=assignment-from-no-return prefix = text.startswith(self.COMMAND_PREFIX) length = len(text) > len(self.COMMAND_PREFIX) if not (prefix and length): ===================================== gajim/common/modules/annotations.py ===================================== --- a/gajim/common/modules/annotations.py +++ b/gajim/common/modules/annotations.py @@ -33,7 +33,7 @@ class Annotations: self.handlers = [] self.annotations = {} - def get_annotations(self): + def get_annotations(self) -> None: if not app.account_is_connected(self._account): return @@ -44,7 +44,7 @@ class Annotations: self._con.connection.SendAndCallForResponse(iq, self._result_received) - def _result_received(self, stanza): + def _result_received(self, stanza: nbxmpp.Iq) -> None: if not nbxmpp.isResultNode(stanza): log.info('Error: %s', stanza.getError()) return @@ -69,7 +69,7 @@ class Annotations: continue self.annotations[jid] = note.getData() - def store_annotations(self): + def store_annotations(self) -> None: if not app.account_is_connected(self._account): return @@ -86,7 +86,7 @@ class Annotations: iq, self._store_result_received) @staticmethod - def _store_result_received(stanza): + def _store_result_received(stanza: nbxmpp.Iq) -> None: if not nbxmpp.isResultNode(stanza): log.warning('Storing rosternotes failed: %s', stanza.getError()) return ===================================== gajim/common/modules/blocking.py ===================================== --- a/gajim/common/modules/blocking.py +++ b/gajim/common/modules/blocking.py @@ -44,7 +44,7 @@ class Blocking: self.supported = True log.info('Discovered blocking: %s', from_) - def get_blocking_list(self): + def get_blocking_list(self) -> None: if not self.supported: return iq = nbxmpp.Iq('get', nbxmpp.NS_BLOCKING) @@ -53,7 +53,7 @@ class Blocking: self._con.connection.SendAndCallForResponse( iq, self._blocking_list_received) - def _blocking_list_received(self, stanza): + def _blocking_list_received(self, stanza: nbxmpp.Iq) -> None: if not nbxmpp.isResultNode(stanza): log.info('Error: %s', stanza.getError()) return @@ -118,12 +118,12 @@ class Blocking: raise nbxmpp.NodeProcessed - def _set_contact_offline(self, jid): + def _set_contact_offline(self, jid: str) -> None: contact_list = app.contacts.get_contacts(self._account, jid) for contact in contact_list: contact.show = 'offline' - def _presence_probe(self, jid): + def _presence_probe(self, jid: str) -> None: log.info('Presence probe: %s', jid) # Send a presence Probe to get the current Status probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -16,6 +16,7 @@ import logging import copy +from typing import Optional from collections import OrderedDict import nbxmpp @@ -62,7 +63,7 @@ class Bookmarks: sorted(sorted_bookmarks.items(), key=lambda bookmark: bookmark[1]['name'].lower())) - def _pubsub_support(self): + def _pubsub_support(self) -> bool: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) @@ -80,7 +81,7 @@ class Bookmarks: log.info('Request Bookmarks (PrivateStorage)') self._request_private_bookmarks() - def _request_pubsub_bookmarks(self): + def _request_pubsub_bookmarks(self) -> None: log.info('Request Bookmarks (PubSub)') self._con.get_module('PubSub').send_pb_retrieve( '', 'storage:bookmarks', @@ -98,7 +99,7 @@ class Bookmarks: self._parse_bookmarks(stanza) self._request_private_bookmarks() - def _request_private_bookmarks(self): + def _request_private_bookmarks(self) -> None: if not app.account_is_connected(self._account): return @@ -109,7 +110,7 @@ class Bookmarks: self._con.connection.SendAndCallForResponse( iq, self._private_bookmarks_received) - def _private_bookmarks_received(self, stanza): + def _private_bookmarks_received(self, stanza: nbxmpp.Iq) -> None: if not nbxmpp.isResultNode(stanza): log.info('No private bookmarks: %s', stanza.getError()) else: @@ -154,11 +155,12 @@ class Bookmarks: return return storage - def _parse_bookmarks(self, stanza, check_merge=False): + def _parse_bookmarks(self, stanza: nbxmpp.Iq, + check_merge: bool = False) -> bool: merged = False storage = self._get_storage_node(stanza) if storage is None: - return + return False confs = storage.getTags('conference') for conf in confs: @@ -204,7 +206,7 @@ class Bookmarks: return merged - def _build_storage_node(self): + def _build_storage_node(self) -> nbxmpp.Node: storage_node = nbxmpp.Node( tag='storage', attrs={'xmlns': 'storage:bookmarks'}) for jid, bm in self.bookmarks.items(): @@ -228,7 +230,7 @@ class Bookmarks: return storage_node @staticmethod - def get_bookmark_publish_options(): + def get_bookmark_publish_options() -> nbxmpp.Node: options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', attrs={'type': 'submit'}) field = options.addChild('field', @@ -254,14 +256,14 @@ class Bookmarks: elif storage_type == BookmarkStorageType.PRIVATE: self._private_store(storage_node) - def _pubsub_store(self, storage_node): + def _pubsub_store(self, storage_node: nbxmpp.Node) -> None: self._con.get_module('PubSub').send_pb_publish( '', 'storage:bookmarks', storage_node, 'current', options=self.get_bookmark_publish_options(), cb=self._pubsub_store_result) log.info('Publish Bookmarks (PubSub)') - def _private_store(self, storage_node): + def _private_store(self, storage_node: nbxmpp.Node) -> None: iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVATE, payload=storage_node) log.info('Publish Bookmarks (PrivateStorage)') self._con.connection.SendAndCallForResponse( @@ -274,12 +276,12 @@ class Bookmarks: return @staticmethod - def _private_store_result(stanza): + def _private_store_result(stanza: nbxmpp.Iq) -> None: if not nbxmpp.isResultNode(stanza): log.error('Error: %s', stanza.getError()) return - def auto_join_bookmarks(self): + def auto_join_bookmarks(self) -> None: if app.is_invisible(self._account): return for jid, bm in self.bookmarks.items(): @@ -306,14 +308,14 @@ class Bookmarks: app.nec.push_incoming_event(BookmarksReceivedEvent( None, account=self._account)) - def get_name_from_bookmark(self, jid): + def get_name_from_bookmark(self, jid: str) -> str: fallback = jid.split('@')[0] try: return self.bookmarks[jid]['name'] or fallback except KeyError: return fallback - def purge_pubsub_bookmarks(self): + def purge_pubsub_bookmarks(self) -> None: log.info('Purge/Delete Bookmarks on PubSub, ' 'because publish options are not available') self._con.get_module('PubSub').send_pb_purge('', 'storage:bookmarks') ===================================== gajim/common/modules/ping.py ===================================== --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -36,12 +36,12 @@ class Ping: ] @staticmethod - def _get_ping_iq(to): + def _get_ping_iq(to: str) -> nbxmpp.Iq: iq = nbxmpp.Iq('get', to=to) iq.addChild(name='ping', namespace=nbxmpp.NS_PING) return iq - def send_keepalive_ping(self): + def send_keepalive_ping(self) -> None: if not app.account_is_connected(self._account): return @@ -55,11 +55,11 @@ class Ping: 'time_for_ping_alive_answer') self._alarm_time = app.idlequeue.set_alarm(self._reconnect, seconds) - def _keepalive_received(self, _stanza): + def _keepalive_received(self, _stanza: nbxmpp.Iq) -> None: log.info('Received keepalive') app.idlequeue.remove_alarm(self._reconnect, self._alarm_time) - def _reconnect(self): + def _reconnect(self) -> None: if not app.config.get_per('accounts', self._account, 'active'): # Account may have been disabled return View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b221e7059efd0474912bd38b11e322f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6b221e7059efd0474912bd38b11e322f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix running pylint
by Yann Leboulanger 12 Sep '18

12 Sep '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6b221e70 by Yann Leboulanger at 2018-09-12T06:42:23Z fix running pylint - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --additional-builtins=_ --disable=all --enable=E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,W0102 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,W0102 gajim run-build: stage: build View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6b221e7059efd0474912bd38b11e322f09… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6b221e7059efd0474912bd38b11e322f09… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Update pylintrc
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 691678b0 by Philipp Hörist at 2018-09-11T21:49:59Z Update pylintrc - - - - - b99632ab by Philipp Hörist at 2018-09-11T22:01:54Z Fix pylint errors - - - - - 29 changed files: - gajim/adhoc_commands.py - gajim/chat_control.py - gajim/common/caps_cache.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/atom.py - gajim/common/modules/dataforms.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/presence.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/pep.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/account_wizard.py - gajim/gtk/service_registration.py - gajim/gtk/single_message.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/search_window.py - pylintrc Changes: ===================================== gajim/adhoc_commands.py ===================================== --- a/gajim/adhoc_commands.py +++ b/gajim/adhoc_commands.py @@ -404,7 +404,7 @@ class CommandWindow: self.commandnode = command.getAttr('node') if command.getTag('x'): - self.dataform = dataforms.ExtendForm(node=command.getTag('x')) + self.dataform = dataforms.extend_form(node=command.getTag('x')) self.data_form_widget.set_sensitive(True) try: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -588,7 +588,7 @@ class ChatControl(ChatControlBase): def on_location_eventbox_button_release_event(self, widget, event): if 'geoloc' in self.contact.pep: - location = self.contact.pep['geoloc']._pep_specific_data + location = self.contact.pep['geoloc'].data if ('lat' in location) and ('lon' in location): uri = 'https://www.openstreetmap.org/?' + \ 'mlat=%(lat)s&mlon=%(lon)s&zoom=16' % {'lat': location['lat'], ===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -448,7 +448,7 @@ class MucCapsCache: elif child.getName() == 'x': if child.getNamespace() == nbxmpp.NS_DATA: from gajim.common.modules import dataforms - data.append(dataforms.ExtendForm(node=child)) + data.append(dataforms.extend_form(node=child)) if nbxmpp.NS_MUC not in features: # Not a MUC, don't cache info ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -382,14 +382,14 @@ class CommonConnection: def update_contact(self, jid, name, groups): if self.connection: - self.getRoster().setItem(jid=jid, name=name, groups=groups) + self.getRoster().set_item(jid=jid, name=name, groups=groups) def update_contacts(self, contacts): """ Update multiple roster items """ if self.connection: - self.getRoster().setItemMulti(contacts) + self.getRoster().set_item_multi(contacts) def new_account(self, name, config, sync=False): """ @@ -1578,7 +1578,7 @@ class Connection(CommonConnection, ConnectionHandlers): iq.setID(id_) self.awaiting_answers[id_] = (AGENT_REMOVED, agent) self.connection.send(iq) - self.getRoster().delItem(agent) + self.getRoster().del_item(agent) def send_new_account_infos(self, form, is_form): if is_form: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -926,7 +926,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): form_tag = feature_tag.getTag('x', namespace=nbxmpp.NS_DATA) if not form_tag: return - self.dataform = dataforms.ExtendForm(node=form_tag) + self.dataform = dataforms.extend_form(node=form_tag) for f in self.dataform.iter_fields(): if f.var == 'stream-method' and f.type_ == 'list-single': values = [o[1] for o in f.options] ===================================== gajim/common/modules/adhoc_commands.py ===================================== --- a/gajim/common/modules/adhoc_commands.py +++ b/gajim/common/modules/adhoc_commands.py @@ -39,7 +39,7 @@ class AdHocCommand: commandfeatures = (nbxmpp.NS_DATA,) @staticmethod - def isVisibleFor(samejid): + def is_visible_for(_samejid): """ This returns True if that command should be visible and invokable for others @@ -54,8 +54,8 @@ class AdHocCommand: self.jid = jid self.sessionid = sessionid - def buildResponse(self, request, status='executing', defaultaction=None, - actions=None): + def build_response(self, request, status='executing', defaultaction=None, + actions=None): assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') @@ -74,12 +74,12 @@ class AdHocCommand: cmd.addChild('actions', attrs, actions) return response, cmd - def badRequest(self, stanza): + def bad_request(self, stanza): self.connection.connection.send( nbxmpp.Error(stanza, nbxmpp.NS_STANZAS + ' bad-request')) def cancel(self, request): - response = self.buildResponse(request, status='canceled')[0] + response = self.build_response(request, status='canceled')[0] self.connection.connection.send(response) return False # finish the session @@ -90,30 +90,30 @@ class ChangeStatusCommand(AdHocCommand): def __init__(self, conn, jid, sessionid): AdHocCommand.__init__(self, conn, jid, sessionid) - self.cb = self.first_step + self._callback = self.first_step @staticmethod - def isVisibleFor(samejid): + def is_visible_for(samejid): """ Change status is visible only if the entity has the same bare jid """ return samejid def execute(self, request): - return self.cb(request) + return self._callback(request) def first_step(self, request): # first query... - response, cmd = self.buildResponse(request, - defaultaction='execute', - actions=['execute']) + response, cmd = self.build_response(request, + defaultaction='execute', + actions=['execute']) cmd.addChild( node=dataforms.SimpleDataForm( title=_('Change status'), instructions=_('Set the presence type and description'), fields=[ - dataforms.Field( + dataforms.create_field( 'list-single', var='presence-type', label='Type of presence:', @@ -126,7 +126,7 @@ class ChangeStatusCommand(AdHocCommand): ('offline', _('Offline - disconnect'))], value='online', required=True), - dataforms.Field( + dataforms.create_field( 'text-multi', var='presence-desc', label=_('Presence description:')) @@ -137,7 +137,7 @@ class ChangeStatusCommand(AdHocCommand): self.connection.connection.send(response) # for next invocation - self.cb = self.second_step + self._callback = self.second_step return True # keep the session @@ -147,19 +147,19 @@ class ChangeStatusCommand(AdHocCommand): form = dataforms.SimpleDataForm( extend=request.getTag('command').getTag('x')) except Exception: - self.badRequest(request) + self.bad_request(request) return False try: presencetype = form['presence-type'].value if presencetype not in ('chat', 'online', 'away', 'xa', 'dnd', 'offline'): - self.badRequest(request) + self.bad_request(request) return False except Exception: # KeyError if there's no presence-type field in form or # AttributeError if that field is of wrong type - self.badRequest(request) + self.bad_request(request) return False try: @@ -167,7 +167,7 @@ class ChangeStatusCommand(AdHocCommand): except Exception: # same exceptions as in last comment presencedesc = '' - response, cmd = self.buildResponse(request, status='completed') + response, cmd = self.build_response(request, status='completed') cmd.addChild('note', {}, _('The status has been changed.')) # if going offline, we need to push response so it won't go into @@ -206,23 +206,23 @@ class LeaveGroupchatsCommand(AdHocCommand): def __init__(self, conn, jid, sessionid): AdHocCommand.__init__(self, conn, jid, sessionid) - self.cb = self.first_step + self._callback = self.first_step @staticmethod - def isVisibleFor(samejid): + def is_visible_for(samejid): """ Leave groupchats is visible only if the entity has the same bare jid """ return samejid def execute(self, request): - return self.cb(request) + return self._callback(request) def first_step(self, request): # first query... - response, cmd = self.buildResponse(request, - defaultaction='execute', - actions=['execute']) + response, cmd = self.build_response(request, + defaultaction='execute', + actions=['execute']) options = [] account = self.connection.name for gc in find_current_groupchats(account): @@ -230,8 +230,8 @@ class LeaveGroupchatsCommand(AdHocCommand): ('%s' % gc[0], _('%(nickname)s on %(room_jid)s') % {'nickname': gc[1], 'room_jid': gc[0]})) - if not len(options): - response, cmd = self.buildResponse(request, status='completed') + if not options: + response, cmd = self.build_response(request, status='completed') cmd.addChild('note', {}, _('You have not joined a groupchat.')) self.connection.connection.send(response) @@ -242,7 +242,7 @@ class LeaveGroupchatsCommand(AdHocCommand): title=_('Leave Groupchats'), instructions=_('Choose the groupchats you want to leave'), fields=[ - dataforms.Field( + dataforms.create_field( 'list-multi', var='groupchats', label=_('Groupchats'), @@ -255,7 +255,7 @@ class LeaveGroupchatsCommand(AdHocCommand): self.connection.connection.send(response) # for next invocation - self.cb = self.second_step + self._callback = self.second_step return True # keep the session @@ -265,13 +265,13 @@ class LeaveGroupchatsCommand(AdHocCommand): form = dataforms.SimpleDataForm( extend=request.getTag('command').getTag('x')) except Exception: - self.badRequest(request) + self.bad_request(request) return False try: gc = form['groupchats'].values except Exception: # KeyError if there's no groupchats in form - self.badRequest(request) + self.bad_request(request) return False account = self.connection.name try: @@ -279,15 +279,16 @@ class LeaveGroupchatsCommand(AdHocCommand): gc_control = app.interface.msg_win_mgr.get_gc_control( room_jid, account) if not gc_control: - gc_control = app.interface.minimized_controls[account][room_jid] + minimized_controls = app.interface.minimized_controls + gc_control = minimized_controls[account][room_jid] gc_control.shutdown() app.interface.roster.remove_groupchat(room_jid, account) continue gc_control.parent_win.remove_tab(gc_control, None, force=True) except Exception: # KeyError if there's no such room opened - self.badRequest(request) + self.bad_request(request) return False - response, cmd = self.buildResponse(request, status='completed') + response, cmd = self.build_response(request, status='completed') note = _('You left the following groupchats:') for room_jid in gc: note += '\n\t' + room_jid @@ -327,13 +328,13 @@ class AdHocCommands: def command_list_query(self, stanza): iq = stanza.buildReply('result') jid = helpers.get_full_jid_from_iq(stanza) - q = iq.getTag('query') + query = iq.getTag('query') # buildReply don't copy the node attribute. Re-add it - q.setAttr('node', nbxmpp.NS_COMMANDS) + query.setAttr('node', nbxmpp.NS_COMMANDS) for node, cmd in self._commands.items(): - if cmd.isVisibleFor(self.is_same_jid(jid)): - q.addChild('item', { + if cmd.is_visible_for(self.is_same_jid(jid)): + query.addChild('item', { # TODO: find the jid 'jid': str(self._con.get_own_jid()), 'node': node, @@ -349,7 +350,7 @@ class AdHocCommands: try: jid = helpers.get_full_jid_from_iq(stanza) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % stanza.getFrom()) + log.warning('Invalid JID: %s, ignoring it', stanza.getFrom()) return node = stanza.getTagAttr('query', 'node') @@ -357,16 +358,16 @@ class AdHocCommands: return False cmd = self._commands[node] - if cmd.isVisibleFor(self.is_same_jid(jid)): + if cmd.is_visible_for(self.is_same_jid(jid)): iq = stanza.buildReply('result') - q = iq.getTag('query') - q.addChild('identity', - attrs={'type': 'command-node', - 'category': 'automation', - 'name': cmd.commandname}) - q.addChild('feature', attrs={'var': nbxmpp.NS_COMMANDS}) + query = iq.getTag('query') + query.addChild('identity', + attrs={'type': 'command-node', + 'category': 'automation', + 'name': cmd.commandname}) + query.addChild('feature', attrs={'var': nbxmpp.NS_COMMANDS}) for feature in cmd.commandfeatures: - q.addChild('feature', attrs={'var': feature}) + query.addChild('feature', attrs={'var': feature}) self._con.connection.send(iq) return True @@ -385,14 +386,14 @@ class AdHocCommands: return False cmd = self._commands[node] - if cmd.isVisibleFor(self.is_same_jid(jid)): + if cmd.is_visible_for(self.is_same_jid(jid)): iq = stanza.buildReply('result') self._con.connection.send(iq) return True return False - def _execute_command_received(self, con, stanza): + def _execute_command_received(self, _con, stanza): jid = helpers.get_full_jid_from_iq(stanza) cmd = stanza.getTag('command') @@ -417,7 +418,7 @@ class AdHocCommands: raise nbxmpp.NodeProcessed newcmd = self._commands[node] - if not newcmd.isVisibleFor(self.is_same_jid(jid)): + if not newcmd.is_visible_for(self.is_same_jid(jid)): log.warning('Command not visible for jid: %s', jid) raise nbxmpp.NodeProcessed @@ -492,7 +493,9 @@ class AdHocCommands: items = stanza.getQueryPayload() commandlist = [] if items: - commandlist = [(t.getAttr('node'), t.getAttr('name')) for t in items] + commandlist = [ + (t.getAttr('node'), t.getAttr('name')) for t in items + ] log.info('Received: %s', commandlist) app.nec.push_incoming_event( @@ -550,7 +553,8 @@ class AdHocCommands: self._con.connection.SendAndCallForResponse( stanza, self._cancel_result_received) - def _cancel_result_received(self, stanza): + @staticmethod + def _cancel_result_received(stanza): if not nbxmpp.isResultNode(stanza): log.warning('Error: %s', stanza.getError()) else: ===================================== gajim/common/modules/atom.py ===================================== --- a/gajim/common/modules/atom.py +++ b/gajim/common/modules/atom.py @@ -44,10 +44,10 @@ class AtomData(AbstractPEPData): type_ = PEPEventType.ATOM def __init__(self, atom): - self._pep_specific_data = atom + self.data = atom def get_entry(self): - return self._pep_specific_data + return self.data class Atom(AbstractPEPModule): ===================================== gajim/common/modules/dataforms.py ===================================== --- a/gajim/common/modules/dataforms.py +++ b/gajim/common/modules/dataforms.py @@ -39,22 +39,22 @@ class WrongFieldValue(Error): # helper class to change class of already existing object -class ExtendedNode(nbxmpp.Node, object): +class ExtendedNode(nbxmpp.Node): @classmethod - def __new__(cls, *a, **b): - if 'extend' not in b.keys() or not b['extend']: + def __new__(cls, *args, **kwargs): + if 'extend' not in kwargs.keys() or not kwargs['extend']: return object.__new__(cls) - extend = b['extend'] + extend = kwargs['extend'] assert issubclass(cls, extend.__class__) extend.__class__ = cls return extend # helper to create fields from scratch -def Field(typ, **attrs): +def create_field(typ, **attrs): ''' Helper function to create a field of given type. ''' - f = { + field = { 'boolean': BooleanField, 'fixed': StringField, 'hidden': StringField, @@ -66,18 +66,18 @@ def Field(typ, **attrs): 'list-single': ListSingleField, 'text-multi': TextMultiField, }[typ](typ=typ, **attrs) - return f + return field -def ExtendField(node): +def extend_field(node): """ Helper function to extend a node to field of appropriate type """ # when validation (XEP-122) will go in, we could have another classes - # like DateTimeField - so that dicts in Field() and ExtendField() will - # be different... + # like DateTimeField - so that dicts in create_field() and + # extend_field() will be different... typ = node.getAttr('type') - f = { + field = { 'boolean': BooleanField, 'fixed': StringField, 'hidden': StringField, @@ -89,25 +89,24 @@ def ExtendField(node): 'list-single': ListSingleField, 'text-multi': TextMultiField, } - if typ not in f: + if typ not in field: typ = 'text-single' - return f[typ](extend=node) + return field[typ](extend=node) -def ExtendForm(node): +def extend_form(node): """ Helper function to extend a node to form of appropriate type """ if node.getTag('reported') is not None: return MultipleDataForm(extend=node) - else: - return SimpleDataForm(extend=node) + return SimpleDataForm(extend=node) class DataField(ExtendedNode): """ Keeps data about one field - var, field type, labels, instructions... Base - class for different kinds of fields. Use Field() function to construct one + class for different kinds of fields. Use create_field() function to construct one of these """ @@ -136,10 +135,10 @@ class DataField(ExtendedNode): 'text-private', 'text-single'. If you set this to something different, DataField will store given name, but treat all data as text-single """ - t = self.getAttr('type') - if t is None: + type_ = self.getAttr('type') + if type_ is None: return 'text-single' - return t + return type_ @type_.setter def type_(self, value): @@ -199,9 +198,9 @@ class DataField(ExtendedNode): @description.deleter def description(self): - t = self.getTag('desc') - if t is not None: - self.delChild(t) + desc = self.getTag('desc') + if desc is not None: + self.delChild(desc) @property def required(self): @@ -212,10 +211,10 @@ class DataField(ExtendedNode): @required.setter def required(self, value): - t = self.getTag('required') - if t and not value: - self.delChild(t) - elif not t and value: + required = self.getTag('required') + if required and not value: + self.delChild(required) + elif not required and value: self.addChild('required') @property @@ -234,11 +233,12 @@ class DataField(ExtendedNode): @media.deleter def media(self): - t = self.getTag('media') - if t is not None: - self.delChild(t) + media = self.getTag('media') + if media is not None: + self.delChild(media) - def is_valid(self): + @staticmethod + def is_valid(): return True @@ -306,12 +306,12 @@ class BooleanField(DataField): """ Value of field. May contain True, False or None """ - v = self.getTagData('value') - if v in ('0', 'false'): + value = self.getTagData('value') + if value in ('0', 'false'): return False - if v in ('1', 'true'): + if value in ('1', 'true'): return True - if v is None: + if value is None: return False # default value is False raise WrongFieldValue @@ -321,9 +321,9 @@ class BooleanField(DataField): @value.deleter def value(self): - t = self.getTag('value') - if t is not None: - self.delChild(t) + value = self.getTag('value') + if value is not None: + self.delChild(value) class StringField(DataField): @@ -366,13 +366,13 @@ class ListField(DataField): """ options = [] for element in self.getTags('option'): - v = element.getTagData('value') - if v is None: + value = element.getTagData('value') + if value is None: raise WrongFieldValue label = element.getAttr('label') if not label: - label = v - options.append((label, v)) + label = value + options.append((label, value)) return options @options.setter @@ -389,13 +389,13 @@ class ListField(DataField): def iter_options(self): for element in self.iterTags('option'): - v = element.getTagData('value') - if v is None: + value = element.getTagData('value') + if value is None: raise WrongFieldValue label = element.getAttr('label') if not label: - label = v - yield (v, label) + label = value + yield (value, label) class ListSingleField(ListField, StringField): @@ -469,7 +469,7 @@ class JidMultiField(ListMultiField): Covers jid-multi fields """ def is_valid(self): - if len(self.values): + if self.values: for value in self.values: try: helpers.parse_jid(value) @@ -526,7 +526,7 @@ class DataRecord(ExtendedNode): if fields is None: for field in self.iterTags('field'): if not isinstance(field, DataField): - ExtendField(field) + extend_field(field) self.vars[field.var] = field else: for field in self.getTags('field'): @@ -545,7 +545,7 @@ class DataRecord(ExtendedNode): del self.fields for field in fields: if not isinstance(field, DataField): - ExtendField(field) + extend_field(field) self.addChild(node=field) @fields.deleter @@ -572,8 +572,8 @@ class DataRecord(ExtendedNode): return self.vars[item] def is_valid(self): - for f in self.iter_fields(): - if not f.is_valid(): + for field in self.iter_fields(): + if not field.is_valid(): return False return True @@ -660,27 +660,29 @@ class SimpleDataForm(DataForm, DataRecord): DataRecord.__init__(self, fields=fields, extend=self, associated=self) def get_purged(self): - c = SimpleDataForm(extend=self) - del c.title - c.instructions = '' + simple_form = SimpleDataForm(extend=self) + del simple_form.title + simple_form.instructions = '' to_be_removed = [] - for f in c.iter_fields(): - if f.required: + for field in simple_form.iter_fields(): + if field.required: # add <value> if there is not - if hasattr(f, 'value') and not f.value: - f.value = '' + if hasattr(field, 'value') and not field.value: + field.value = '' # Keep all required fields continue - if ((hasattr(f, 'value') and not f.value and f.value != 0) or - (hasattr(f, 'values') and len(f.values) == 0)): - to_be_removed.append(f) + if ((hasattr(field, 'value') and + not field.value and + field.value != 0) or + (hasattr(field, 'values') and not field.values)): + to_be_removed.append(field) else: - del f.label - del f.description - del f.media - for f in to_be_removed: - c.delChild(f) - return c + del field.label + del field.description + del field.media + for field in to_be_removed: + simple_form.delChild(field) + return simple_form class MultipleDataForm(DataForm): ===================================== gajim/common/modules/muc.py ===================================== --- a/gajim/common/modules/muc.py +++ b/gajim/common/modules/muc.py @@ -130,7 +130,7 @@ class MUC: for form in payload: if form.getNamespace() == nbxmpp.NS_DATA: - dataform = dataforms.ExtendForm(node=form) + dataform = dataforms.extend_form(node=form) log.info('Config form received for %s', room_jid) app.nec.push_incoming_event(MucOwnerReceivedEvent( None, ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -211,10 +211,10 @@ class AbstractPEPData: return other == self.type_ def __bool__(self): - return self._pep_specific_data is not None + return self.data is not None def __str__(self): - return str(self._pep_specific_data) + return str(self.data) class PEPReceivedEvent(NetworkIncomingEvent): ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -138,15 +138,15 @@ class Presence: if not app.account_is_connected(self._account): return if remove_auth: - self._con.getRoster().delItem(jid) + self._con.getRoster().del_item(jid) jid_list = app.config.get_per('contacts') for j in jid_list: if j.startswith(jid): app.config.del_per('contacts', j) else: log.info('Unsubscribe from %s', jid) - self._con.getRoster().Unsubscribe(jid) - self._con.getRoster().setItem(jid) + self._con.getRoster().unsubscribe(jid) + self._con.getRoster().set_item(jid) def subscribe(self, jid, msg=None, name='', groups=None, auto_auth=False): if not app.account_is_connected(self._account): ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -254,7 +254,7 @@ class PubSub: app.nec.push_incoming_event(PubSubConfigReceivedEvent( None, conn=self._con, node=node, - form=dataforms.ExtendForm(node=form))) + form=dataforms.extend_form(node=form))) @staticmethod def _default_callback(_con, stanza, *args, **kwargs): ===================================== gajim/common/modules/roster.py ===================================== --- a/gajim/common/modules/roster.py +++ b/gajim/common/modules/roster.py @@ -45,7 +45,7 @@ class Roster: account_jid = self._con.get_own_jid().getStripped() data = app.logger.get_roster(account_jid) if data: - self.setRaw(data) + self.set_raw(data) for jid, item in self._data.items(): app.nec.push_incoming_event(NetworkEvent( 'roster-info', @@ -170,7 +170,7 @@ class Roster: attrs = item.getAttrs() del attrs['jid'] - groups = set([group.getData() for group in item.getTags('group')]) + groups = {group.getData() for group in item.getTags('group')} attrs['groups'] = list(groups) if update: @@ -241,14 +241,14 @@ class Roster: self._data[jid]['ask'], self._data[jid]['groups']) - def _getItemData(self, jid, dataname): + def _get_item_data(self, jid, dataname): """ Return specific jid's representation in internal format. """ jid = jid[:(jid + '/').find('/')] return self._data[jid][dataname] - def delItem(self, jid): + def del_item(self, jid): """ Delete contact 'jid' from roster """ @@ -256,19 +256,19 @@ class Roster: nbxmpp.Iq('set', nbxmpp.NS_ROSTER, payload=[ nbxmpp.Node('item', {'jid': jid, 'subscription': 'remove'})])) - def getGroups(self, jid): + def get_groups(self, jid): """ Return groups list that contact 'jid' belongs to """ - return self._getItemData(jid, 'groups') + return self._get_item_data(jid, 'groups') - def getName(self, jid): + def get_name(self, jid): """ Return name of contact 'jid' """ - return self._getItemData(jid, 'name') + return self._get_item_data(jid, 'name') - def setItem(self, jid, name=None, groups=None): + def set_item(self, jid, name=None, groups=None): """ Rename contact 'jid' and sets the groups list that it now belongs to """ @@ -283,7 +283,7 @@ class Roster: item.addChild(node=nbxmpp.Node('group', payload=[group])) self._con.connection.send(iq) - def setItemMulti(self, items): + def set_item_multi(self, items): """ Rename multiple contacts and sets their group lists """ @@ -298,7 +298,7 @@ class Roster: item.addChild(node=nbxmpp.Node('group', payload=[group])) self._con.connection.send(iq) - def getItems(self): + def get_items(self): """ Return list of all [bare] JIDs that the roster is currently tracks """ @@ -306,7 +306,7 @@ class Roster: def keys(self): """ - Same as getItems. Provided for the sake of dictionary interface + Same as get_items. Provided for the sake of dictionary interface """ return list(self._data.keys()) @@ -317,7 +317,7 @@ class Roster: """ return self._data[item] - def getItem(self, item): + def get_item(self, item): """ Get the contact in the internal format (or None if JID 'item' is not in roster) @@ -325,19 +325,19 @@ class Roster: if item in self._data: return self._data[item] - def Unsubscribe(self, jid): + def unsubscribe(self, jid): """ Ask for removing our subscription for JID 'jid' """ self._con.connection.send(nbxmpp.Presence(jid, 'unsubscribe')) - def getRaw(self): + def get_raw(self): """ Return the internal data representation of the roster """ return self._data - def setRaw(self, data): + def set_raw(self, data): """ Set the internal data representation of the roster """ ===================================== gajim/common/modules/user_activity.py ===================================== --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -31,10 +31,10 @@ class UserActivityData(AbstractPEPData): type_ = PEPEventType.ACTIVITY def __init__(self, activity): - self._pep_specific_data = activity + self.data = activity def asMarkupText(self): - pep = self._pep_specific_data + pep = self.data activity = pep['activity'] subactivity = pep['subactivity'] if 'subactivity' in pep else None text = pep['text'] if 'text' in pep else None ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -33,7 +33,7 @@ class UserAvatarData(AbstractPEPData): type_ = PEPEventType.AVATAR def __init__(self, avatar): - self._pep_specific_data = avatar + self.data = avatar class UserAvatar(AbstractPEPModule): @@ -124,7 +124,7 @@ class UserAvatar(AbstractPEPModule): return avatar or None def _notification_received(self, jid, user_pep): - avatar = user_pep._pep_specific_data + avatar = user_pep.data own_jid = self._con.get_own_jid() if avatar is None: # Remove avatar ===================================== gajim/common/modules/user_location.py ===================================== --- a/gajim/common/modules/user_location.py +++ b/gajim/common/modules/user_location.py @@ -31,10 +31,12 @@ class UserLocationData(AbstractPEPData): type_ = PEPEventType.LOCATION def __init__(self, location): + # set_location plugin uses self._pep_specific_data self._pep_specific_data = location + self.data = location def asMarkupText(self): - location = self._pep_specific_data + location = self.data location_string = '' for entry in location.keys(): ===================================== gajim/common/modules/user_mood.py ===================================== --- a/gajim/common/modules/user_mood.py +++ b/gajim/common/modules/user_mood.py @@ -31,13 +31,13 @@ class UserMoodData(AbstractPEPData): type_ = PEPEventType.MOOD def __init__(self, mood): - self._pep_specific_data = mood + self.data = mood def asMarkupText(self): - mood = self._translate_mood(self._pep_specific_data['mood']) + mood = self._translate_mood(self.data['mood']) markuptext = '<b>%s</b>' % GLib.markup_escape_text(mood) - if 'text' in self._pep_specific_data: - text = self._pep_specific_data['text'] + if 'text' in self.data: + text = self.data['text'] markuptext += ' (%s)' % GLib.markup_escape_text(text) return markuptext ===================================== gajim/common/modules/user_nickname.py ===================================== --- a/gajim/common/modules/user_nickname.py +++ b/gajim/common/modules/user_nickname.py @@ -31,10 +31,10 @@ class UserNicknameData(AbstractPEPData): type_ = PEPEventType.NICKNAME def __init__(self, nickname): - self._pep_specific_data = nickname + self.data = nickname def get_nick(self): - return self._pep_specific_data or '' + return self.data or '' class UserNickname(AbstractPEPModule): ===================================== gajim/common/modules/user_tune.py ===================================== --- a/gajim/common/modules/user_tune.py +++ b/gajim/common/modules/user_tune.py @@ -31,10 +31,10 @@ class UserTuneData(AbstractPEPData): type_ = PEPEventType.TUNE def __init__(self, tune): - self._pep_specific_data = tune + self.data = tune def asMarkupText(self): - tune = self._pep_specific_data + tune = self.data artist = tune.get('artist', _('Unknown Artist')) artist = GLib.markup_escape_text(artist) ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -40,7 +40,7 @@ class AbstractPEP(object): return None def __init__(self, jid, account, items): - self._pep_specific_data, self._retracted = self._extract_info(items) + self.data, self._retracted = self._extract_info(items) self._update_contacts(jid, account) if jid == app.get_jid_from_account(account): ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1554,7 +1554,7 @@ class DataFormWindow(Dialog): self.set_resizable(True) gtkgui_helpers.resize_window(self, 600, 400) self.dataform_widget = dataforms_widget.DataFormWidget() - self.dataform = dataforms.ExtendForm(node=form) + self.dataform = dataforms.extend_form(node=form) self.dataform_widget.set_sensitive(True) self.dataform_widget.data_form = self.dataform self.dataform_widget.show_all() ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1200,7 +1200,7 @@ class GroupchatControl(ChatControlBase): self.form_widget.hide() self.form_widget.destroy() self.btn_box.destroy() - dataform = dataforms.ExtendForm(node=obj.captcha_form) + dataform = dataforms.extend_form(node=obj.captcha_form) self.form_widget = dataforms_widget.DataFormWidget(dataform) def on_send_dataform_clicked(widget): ===================================== gajim/gtk/account_wizard.py ===================================== --- a/gajim/gtk/account_wizard.py +++ b/gajim/gtk/account_wizard.py @@ -371,7 +371,7 @@ class AccountCreationWizard: self.is_form = obj.is_form empty_config = True if obj.is_form: - dataform = dataforms.ExtendForm(node=obj.config) + dataform = dataforms.extend_form(node=obj.config) self.data_form_widget = dataforms_widget.DataFormWidget() self.data_form_widget.selectable = True self.data_form_widget.set_data_form(dataform) ===================================== gajim/gtk/service_registration.py ===================================== --- a/gajim/gtk/service_registration.py +++ b/gajim/gtk/service_registration.py @@ -86,7 +86,7 @@ class ServiceRegistration(Gtk.Assistant): log.info('Show Form page') self._is_form = is_form if is_form: - dataform = dataforms.ExtendForm(node=form) + dataform = dataforms.extend_form(node=form) self._data_form_widget = DataFormWidget(dataform) else: from gajim import config ===================================== gajim/gtk/single_message.py ===================================== --- a/gajim/gtk/single_message.py +++ b/gajim/gtk/single_message.py @@ -79,7 +79,7 @@ class SingleMessageWindow: parent_box = self.xml.get_object('conversation_scrolledwindow').\ get_parent() if form_node: - dataform = dataforms.ExtendForm(node=form_node) + dataform = dataforms.extend_form(node=form_node) dataform.type_ = 'submit' self.form_widget = DataFormWidget(dataform) self.form_widget.show_all() ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -607,7 +607,7 @@ def load_activity_icon(category, activity = None): def get_pep_as_pixbuf(pep_class): if pep_class == PEPEventType.MOOD: - received_mood = pep_class._pep_specific_data['mood'] + received_mood = pep_class.data['mood'] mood = received_mood if received_mood in MOODS else 'unknown' pixbuf = load_mood_icon(mood).get_pixbuf() return pixbuf @@ -619,7 +619,7 @@ def get_pep_as_pixbuf(pep_class): return GdkPixbuf.Pixbuf.new_from_file(path) return icon elif pep_class == PEPEventType.ACTIVITY: - pep_ = pep_class._pep_specific_data + pep_ = pep_class.data activity = pep_['activity'] has_known_activity = activity in ACTIVITIES ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2432,7 +2432,7 @@ class Interface: @staticmethod def get_pep_icon(pep_obj): if pep_obj == PEPEventType.MOOD: - received_mood = pep_obj._pep_specific_data['mood'] + received_mood = pep_obj.data['mood'] mood = received_mood if received_mood in MOODS else 'unknown' return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() elif pep_obj == PEPEventType.TUNE: @@ -2440,7 +2440,7 @@ class Interface: configpaths.get('DATA'), 'emoticons', 'static', 'music.png') return GdkPixbuf.Pixbuf.new_from_file(path) elif pep_obj == PEPEventType.ACTIVITY: - pep_ = pep_obj._pep_specific_data + pep_ = pep_obj.data activity = pep_['activity'] has_known_activity = activity in ACTIVITIES ===================================== gajim/search_window.py ===================================== --- a/gajim/search_window.py +++ b/gajim/search_window.py @@ -136,7 +136,7 @@ class SearchWindow: if obj.is_dataform: self.is_form = True self.data_form_widget = dataforms_widget.DataFormWidget() - self.dataform = dataforms.ExtendForm(node=obj.data) + self.dataform = dataforms.extend_form(node=obj.data) self.data_form_widget.set_sensitive(True) try: self.data_form_widget.data_form = self.dataform @@ -208,7 +208,7 @@ class SearchWindow: self.information_button.show() return - self.dataform = dataforms.ExtendForm(node=obj.data) + self.dataform = dataforms.extend_form(node=obj.data) if len(self.dataform.items) == 0: # No result self.label.set_text(_('No result')) ===================================== pylintrc ===================================== --- a/pylintrc +++ b/pylintrc @@ -50,7 +50,7 @@ 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" -disable=C0111,C0301,R1710,R0912,R0914,R0915,W0511 +disable=C0111,C0301,R1710,R0912,R0914,R0915,W0511,W0231,W0233 # 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 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c9455de4bd7e17901b4b1296fc7aa6edb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c9455de4bd7e17901b4b1296fc7aa6edb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add mypy test to CI
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c9455de4 by Philipp Hörist at 2018-09-11T20:46:57Z Add mypy test to CI - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,11 @@ run-test: script: - python3 setup.py test_nogui +run-mypy: + stage: test + script: + - mypy -p gajim.common.modules --follow-imports=skip + run-pylint: stage: test script: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c9455de4bd7e17901b4b1296fc7aa6edb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c9455de4bd7e17901b4b1296fc7aa6edb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Make some vars private
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ad38d53 by Philipp Hörist at 2018-09-11T18:00:34Z Make some vars private - - - - - 3080946e by Philipp Hörist at 2018-09-11T20:24:08Z Update pylintrc - - - - - 09c51835 by Philipp Hörist at 2018-09-11T20:25:55Z Fix pylint errors in common/modules - - - - - 30 changed files: - gajim/common/modules/__init__.py - gajim/common/modules/annotations.py - gajim/common/modules/atom.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/caps.py - gajim/common/modules/carbons.py - gajim/common/modules/date_and_time.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/metacontacts.py - gajim/common/modules/misc.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/receipts.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/security_labels.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad7def794f545382b99ba53f8dda4ce5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad7def794f545382b99ba53f8dda4ce5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch error if no translation is found
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dad7def7 by Philipp Hörist at 2018-09-11T17:37:48Z Catch error if no translation is found - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -136,7 +136,11 @@ if hasattr(locale, 'bindtextdomain'): gettext.textdomain(DOMAIN) gettext.install(DOMAIN, _localedir) -_ = gettext.translation(DOMAIN, _localedir).gettext + +try: + _ = gettext.translation(DOMAIN, _localedir).gettext +except OSError: + _ = gettext.gettext if gettext._translations: _translations = list(gettext._translations.values())[0] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad7def794f545382b99ba53f8dda4ce52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad7def794f545382b99ba53f8dda4ce52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Add mypy.ini
by Philipp Hörist 11 Sep '18

11 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7140c2d2 by Philipp Hörist at 2018-09-10T22:36:54Z Add mypy.ini - - - - - bcf2a377 by Philipp Hörist at 2018-09-10T22:37:00Z Remove unnecessary code NetworkIncomingEvent defines base_network_events and generate() already - - - - - ca9b4cb5 by Philipp Hörist at 2018-09-10T22:47:54Z Add annotations for modules/__init__.py - - - - - 2649b3d0 by Philipp Hörist at 2018-09-10T22:47:59Z Add annotations to modules/util.py - - - - - 21672fad by Philipp Hörist at 2018-09-11T17:27:10Z Refactor i18n - Make _() available, so other modules can import it from i18n, we need this because mypy cant handle _() in the builtins namespace - - - - - a34bf54c by Philipp Hörist at 2018-09-11T17:29:08Z Fix mypy error regarding _() - - - - - 19 changed files: - gajim/common/i18n.py - gajim/common/modules/__init__.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/misc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/software_version.py - gajim/common/modules/util.py - gajim/common/modules/vcard_temp.py - + mypy.ini Changes: ===================================== gajim/common/i18n.py ===================================== --- a/gajim/common/i18n.py +++ b/gajim/common/i18n.py @@ -29,45 +29,6 @@ direction_mark = '\u200E' _translations = None -def initialize(): - global _translations - try: - locale.setlocale(locale.LC_ALL, '') - except locale.Error as error: - print(error) - - initialize_lang() - set_i18n_env() - - localedir = get_locale_dir() - if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, localedir) - - gettext.install(DOMAIN, localedir) - if gettext._translations: - _translations = list(gettext._translations.values())[0] - else: - _translations = gettext.NullTranslations() - - -def set_i18n_env(): - if os.name == 'nt': - os.environ['LANG'] = LANG - - -def initialize_lang(): - global LANG - try: - # en_US, fr_FR, el_GR etc.. - default = locale.getdefaultlocale()[0] - if default is None: - # LC_ALL=C - return - LANG = default[:2] - except (ValueError, locale.Error): - pass - - def get_locale_dir(): if os.name == 'nt': return None @@ -75,9 +36,9 @@ def get_locale_dir(): path = gettext.find(DOMAIN) if path: # extract localedir from localedir/language/LC_MESSAGES/domain.mo - path, tail = os.path.split(path) - path, tail = os.path.split(path) - localedir, tail = os.path.split(path) + path = os.path.split(path)[1] + path = os.path.split(path)[1] + localedir = os.path.split(path)[1] elif os.path.exists('/app/share/run-as-flatpak'): # Check if we run as flatpak return '/app/share/locale' @@ -110,7 +71,7 @@ def paragraph_direction_mark(text): bidi = unicodedata.bidirectional(char) if bidi == 'L': return '\u200E' - elif bidi == 'AL' or bidi == 'R': + if bidi in ('AL', 'R'): return '\u200F' return '\u200E' @@ -133,14 +94,15 @@ def Q_(text): """ text = _(text) if text.startswith('?'): - qualifier, text = text.split(':', 1) + text = text.split(':', 1)[1] return text def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): """ Use as: - i18n.ngettext('leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') + i18n.ngettext( + 'leave room %s', 'leave rooms %s', len(rooms), 'a', 'a, b, c') In other words this is a hack to ngettext() to support %s %d etc.. """ @@ -152,4 +114,31 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): return text -initialize() +try: + locale.setlocale(locale.LC_ALL, '') +except locale.Error as error: + print(error) + +try: + # en_US, fr_FR, el_GR etc.. + default = locale.getdefaultlocale()[0] + if default is not None: + LANG = default[:2] +except (ValueError, locale.Error): + pass + +if os.name == 'nt': + os.environ['LANG'] = LANG + +_localedir = get_locale_dir() +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, _localedir) +gettext.textdomain(DOMAIN) + +gettext.install(DOMAIN, _localedir) +_ = gettext.translation(DOMAIN, _localedir).gettext + +if gettext._translations: + _translations = list(gettext._translations.values())[0] +else: + _translations = gettext.NullTranslations() ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -13,6 +13,9 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging +from typing import List # noqa +from typing import Dict # noqa +from typing import Any # noqa from importlib import import_module from pathlib import Path from unittest.mock import MagicMock @@ -21,8 +24,8 @@ log = logging.getLogger('gajim.c.m') ZEROCONF_MODULES = ['adhoc_commands', 'receipts', 'discovery'] -imported_modules = [] -_modules = {} +imported_modules = [] # type: List[tuple] +_modules = {} # type: Dict[str, Dict[str, Any]] for file in Path(__file__).parent.iterdir(): if file.stem == '__init__': @@ -40,30 +43,30 @@ for file in Path(__file__).parent.iterdir(): class ModuleMock: - def __init__(self, name): + def __init__(self, name: str) -> None: self._name = name # HTTPUpload, .. self.available = False # Blocking - self.blocked = [] + self.blocked = [] # type: List[Any] # Privacy Lists - self.blocked_contacts = [] - self.blocked_groups = [] + self.blocked_contacts = [] # type: List[Any] + self.blocked_groups = [] # type: List[Any] self.blocked_all = False # Delimiter self.delimiter = '::' # Bookmarks - self.bookmarks = {} + self.bookmarks = {} # type: Dict[Any, Any] # Various Modules self.supported = False - def __getattr__(self, key): + def __getattr__(self, key: str) -> MagicMock: return MagicMock() @@ -101,7 +104,7 @@ def unregister_single(con, name): del _modules[con.name][name] -def get(account, name): +def get(account: str, name: str) -> Any: try: return _modules[account][name] except KeyError: ===================================== gajim/common/modules/adhoc_commands.py ===================================== --- a/gajim/common/modules/adhoc_commands.py +++ b/gajim/common/modules/adhoc_commands.py @@ -20,11 +20,14 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging + import nbxmpp +from gajim.common import app from gajim.common import helpers +from gajim.common.i18n import _ from gajim.common.modules import dataforms -from gajim.common import app + from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.commands') @@ -556,17 +559,14 @@ class AdHocCommands: class AdHocCommandError(NetworkIncomingEvent): name = 'adhoc-command-error' - base_network_events = [] class AdHocCommandListReceived(NetworkIncomingEvent): name = 'adhoc-command-list' - base_network_events = [] class AdHocCommandActionResponse(NetworkIncomingEvent): name = 'adhoc-command-action-response' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/blocking.py ===================================== --- a/gajim/common/modules/blocking.py +++ b/gajim/common/modules/blocking.py @@ -160,7 +160,6 @@ class Blocking: class BlockingEvent(NetworkIncomingEvent): name = 'blocking' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -320,7 +320,6 @@ class Bookmarks: class BookmarksReceivedEvent(NetworkIncomingEvent): name = 'bookmarks-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -133,10 +133,6 @@ class EntityTime: class TimeResultReceivedEvent(NetworkIncomingEvent): name = 'time-result-received' - base_network_events = [] - - def generate(self): - return True def get_instance(*args, **kwargs): ===================================== gajim/common/modules/http_auth.py ===================================== --- a/gajim/common/modules/http_auth.py +++ b/gajim/common/modules/http_auth.py @@ -74,7 +74,6 @@ class HTTPAuth: class HttpAuthReceivedEvent(NetworkIncomingEvent): name = 'http-auth-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -421,7 +421,6 @@ class UploadAbortedException(Exception): class HTTPUploadProgressEvent(NetworkIncomingEvent): name = 'httpupload-progress' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/misc.py ===================================== --- a/gajim/common/modules/misc.py +++ b/gajim/common/modules/misc.py @@ -19,6 +19,7 @@ import logging import nbxmpp from gajim.common import app +from gajim.common.i18n import _ from gajim.common.modules.date_and_time import parse_datetime log = logging.getLogger('gajim.c.m.misc') ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -219,7 +219,6 @@ class AbstractPEPData: class PEPReceivedEvent(NetworkIncomingEvent): name = 'pep-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/ping.py ===================================== --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -109,17 +109,14 @@ class Ping: class PingSentEvent(NetworkIncomingEvent): name = 'ping-sent' - base_network_events = [] class PingReplyEvent(NetworkIncomingEvent): name = 'ping-reply' - base_network_events = [] class PingErrorEvent(NetworkIncomingEvent): name = 'ping-error' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/privacylists.py ===================================== --- a/gajim/common/modules/privacylists.py +++ b/gajim/common/modules/privacylists.py @@ -445,17 +445,14 @@ class PrivacyLists: class PrivacyListsReceivedEvent(NetworkIncomingEvent): name = 'privacy-lists-received' - base_network_events = [] class PrivacyListReceivedEvent(NetworkIncomingEvent): name = 'privacy-list-received' - base_network_events = [] class PrivacyListRemovedEvent(NetworkIncomingEvent): name = 'privacy-list-removed' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -263,7 +263,6 @@ class PubSub: class PubSubConfigReceivedEvent(NetworkIncomingEvent): name = 'pubsub-config-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -120,7 +120,6 @@ class RosterItemExchange: class RosterItemExchangeEvent(NetworkIncomingEvent): name = 'roster-item-exchange-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/search.py ===================================== --- a/gajim/common/modules/search.py +++ b/gajim/common/modules/search.py @@ -106,12 +106,10 @@ class Search: class SearchFormReceivedEvent(NetworkIncomingEvent): name = 'search-form-received' - base_network_events = [] class SearchResultReceivedEvent(NetworkIncomingEvent): name = 'search-result-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== gajim/common/modules/software_version.py ===================================== --- a/gajim/common/modules/software_version.py +++ b/gajim/common/modules/software_version.py @@ -100,10 +100,6 @@ class SoftwareVersion: class VersionResultReceivedEvent(NetworkIncomingEvent): name = 'version-result-received' - base_network_events = [] - - def generate(self): - return True def get_instance(*args, **kwargs): ===================================== gajim/common/modules/util.py ===================================== --- a/gajim/common/modules/util.py +++ b/gajim/common/modules/util.py @@ -14,12 +14,15 @@ # Util module +from typing import Union + import nbxmpp from gajim.common import app -def is_self_message(message, groupchat=False): +def is_self_message(message: nbxmpp.Node, + groupchat: bool = False) -> bool: if groupchat: return False frm = message.getFrom() @@ -27,7 +30,9 @@ def is_self_message(message, groupchat=False): return frm.bareMatch(to) -def is_muc_pm(message, jid, groupchat=False): +def is_muc_pm(message: nbxmpp.Node, + jid: nbxmpp.JID, + groupchat: bool = False) -> bool: if groupchat: return False muc_user = message.getTag('x', namespace=nbxmpp.NS_MUC_USER) @@ -41,10 +46,10 @@ def is_muc_pm(message, jid, groupchat=False): return False -def from_xs_boolean(value): +def from_xs_boolean(value: Union[str, bool]) -> bool: # Convert a xs:boolean ('true', 'false', '1', '0', '') # to a python boolean (True, False) - if value in (True, False): + if isinstance(value, bool): return value if value in ('1', 'true'): @@ -58,16 +63,16 @@ def from_xs_boolean(value): 'Cant convert %s to python boolean' % value) -def to_xs_boolean(value): +def to_xs_boolean(value: Union[bool, None]) -> str: # Convert to xs:boolean ('true', 'false') # from a python boolean (True, False) or None - if value in ('true', 'false'): - return value - if value is True: return 'true' - if value in (False, None): + if value is False: + return 'false' + + if value is None: return 'false' raise ValueError( ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -310,17 +310,14 @@ class VCardTemp: class VcardPublishedEvent(NetworkIncomingEvent): name = 'vcard-published' - base_network_events = [] class VcardNotPublishedEvent(NetworkIncomingEvent): name = 'vcard-not-published' - base_network_events = [] class VcardReceivedEvent(NetworkIncomingEvent): name = 'vcard-received' - base_network_events = [] def get_instance(*args, **kwargs): ===================================== mypy.ini ===================================== --- /dev/null +++ b/mypy.ini @@ -0,0 +1,10 @@ +[mypy] +python_version = 3.5 +disallow_incomplete_defs = True + +[mypy-nbxmpp.*] +ignore_missing_imports = True + +[mypy-gi.repository.*] +ignore_missing_imports = True + View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ac31ba5b613d41441c98b4f47e4c9c55… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ac31ba5b613d41441c98b4f47e4c9c55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update .gitignore
by Philipp Hörist 10 Sep '18

10 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6ac31ba5 by Philipp Hörist at 2018-09-10T22:03:12Z Update .gitignore - - - - - 1 changed file: - .gitignore Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ po/stamp-it stamp-h1 Makefile __pycache__/ +.mypy_cache/ build/ dist/ gajim.egg-info/ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ac31ba5b613d41441c98b4f47e4c9c559… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6ac31ba5b613d41441c98b4f47e4c9c559… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add debug output for NetworkMonitor
by Philipp Hörist 10 Sep '18

10 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0fba2b8a by Philipp Hörist at 2018-09-10T18:27:22Z Add debug output for NetworkMonitor - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2500,6 +2500,7 @@ class Interface: # same state, not only on change. return self.network_state = connected + log.debug('NetworkMonitor state change: %s', connected) if connected: for connection in app.connections.values(): if connection.connected <= 0 and connection.time_to_reconnect: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0fba2b8a58fe47d406a2b4f58fbfa6abd9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0fba2b8a58fe47d406a2b4f58fbfa6abd9… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2018