# HG changeset patch # User Goffi # Date 1547201595 -3600 # Node ID 378188abe94157d7b370456147e5ee67d87920ef # Parent 92af49cde25501e1089ebc702e02269cc6f9d5ba misc: replaced all "dummy" by the more conventional and readable "__" ("_" being used for gettext) diff -r 92af49cde255 -r 378188abe941 sat/bridge/bridge_constructor/constructors/embedded/constructor.py --- a/sat/bridge/bridge_constructor/constructors/embedded/constructor.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/bridge/bridge_constructor/constructors/embedded/constructor.py Fri Jan 11 11:13:15 2019 +0100 @@ -58,7 +58,7 @@ if async_: completion["cb_or_lambda"] = ( - "callback" if function["sig_out"] else "lambda dummy: callback()" + "callback" if function["sig_out"] else "lambda __: callback()" ) completion[ "ret_routine" diff -r 92af49cde255 -r 378188abe941 sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py --- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py Fri Jan 11 11:13:15 2019 +0100 @@ -54,7 +54,7 @@ if async_: d = self._methods_cbs[name](*args, **kwargs) if callback is not None: - d.addCallback(callback if out_sign else lambda dummy: callback()) + d.addCallback(callback if out_sign else lambda __: callback()) if errback is None: d.addErrback(lambda failure_: log.error(failure_)) else: diff -r 92af49cde255 -r 378188abe941 sat/bridge/bridge_constructor/constructors/pb/constructor.py --- a/sat/bridge/bridge_constructor/constructors/pb/constructor.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/bridge/bridge_constructor/constructors/pb/constructor.py Fri Jan 11 11:13:15 2019 +0100 @@ -58,7 +58,7 @@ "args_no_def": self.getArguments(function["sig_in"], name=arg_doc), "callback": "callback" if function["sig_out"] - else "lambda dummy: callback()", + else "lambda __: callback()", "debug": "" if not self.args.debug else 'log.debug ("%s")\n%s' % (completion["name"], 8 * " "), diff -r 92af49cde255 -r 378188abe941 sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py --- a/sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/bridge/bridge_constructor/constructors/pb/pb_frontend_template.py Fri Jan 11 11:13:15 2019 +0100 @@ -119,7 +119,7 @@ reactor.connectTCP("localhost", 8789, factory) d = factory.getRootObject() d.addCallback(self._set_root) - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) d.addErrback(errback) def register_signal(self, functionName, handler, iface="core"): diff -r 92af49cde255 -r 378188abe941 sat/core/sat_main.py --- a/sat/core/sat_main.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/core/sat_main.py Fri Jan 11 11:13:15 2019 +0100 @@ -411,7 +411,7 @@ if options is None: options = {} - def connectProfile(dummy=None): + def connectProfile(__=None): if self.isConnected(profile): log.info(_("already connected !")) return True @@ -420,7 +420,7 @@ d = xmpp.SatXMPPComponent.startConnection(self, profile, max_retries) else: d = xmpp.SatXMPPClient.startConnection(self, profile, max_retries) - return d.addCallback(lambda dummy: False) + return d.addCallback(lambda __: False) d = self.memory.startSession(password, profile) d.addCallback(connectProfile) @@ -492,7 +492,7 @@ def getContacts(self, profile_key): client = self.getClient(profile_key) - def got_roster(dummy): + def got_roster(__): ret = [] for item in client.roster.getItems(): # we get all items for client's roster # and convert them to expected format @@ -1032,7 +1032,7 @@ progress_all[profile] = progress_dict for ( progress_id, - (dummy, progress_metadata), + (__, progress_metadata), ) in client._progress_cb.iteritems(): progress_dict[progress_id] = progress_metadata return progress_all @@ -1052,7 +1052,7 @@ profile = client.profile progress_dict = {} progress_all[profile] = progress_dict - for progress_id, (progress_cb, dummy) in client._progress_cb.iteritems(): + for progress_id, (progress_cb, __) in client._progress_cb.iteritems(): progress_dict[progress_id] = progress_cb(progress_id, profile) return progress_all diff -r 92af49cde255 -r 378188abe941 sat/memory/disco.py --- a/sat/memory/disco.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/memory/disco.py Fri Jan 11 11:13:15 2019 +0100 @@ -299,7 +299,7 @@ d = self.getItems(client, jid_) d.addCallback(gotItems) - d.addCallback(lambda dummy: found_entities) + d.addCallback(lambda __: found_entities) reactor.callLater( TIMEOUT, d.cancel ) # FIXME: one bad service make a general timeout @@ -338,7 +338,7 @@ d = self.getItems(client, jid_) d.addCallback(gotItems) - d.addCallback(lambda dummy: found_entities) + d.addCallback(lambda __: found_entities) reactor.callLater( TIMEOUT, d.cancel ) # FIXME: one bad service make a general timeout diff -r 92af49cde255 -r 378188abe941 sat/memory/memory.py --- a/sat/memory/memory.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/memory/memory.py Fri Jan 11 11:13:15 2019 +0100 @@ -353,14 +353,14 @@ """ profile = self.getProfileName(profile) - def createSession(dummy): + def createSession(__): """Called once params are loaded.""" self._entities_cache[profile] = {} log.info(u"[{}] Profile session started".format(profile)) return False - def backendInitialised(dummy): - def doStartSession(dummy=None): + def backendInitialised(__): + def doStartSession(__=None): if self.isSessionStarted(profile): log.info("Session already started!") return True @@ -558,7 +558,7 @@ d = self.params.createProfile(name, component) - def initPersonalKey(dummy): + def initPersonalKey(__): # be sure to call this after checking that the profile doesn't exist yet personal_key = BlockCipher.getRandomKey( base64=True @@ -567,24 +567,24 @@ {C.MEMORY_CRYPTO_KEY: personal_key}, profile=name ) # will be encrypted by setParam - def startFakeSession(dummy): + def startFakeSession(__): # avoid ProfileNotConnected exception in setParam self._entities_cache[name] = None self.params.loadIndParams(name) - def stopFakeSession(dummy): + def stopFakeSession(__): del self._entities_cache[name] self.params.purgeProfile(name) d.addCallback(initPersonalKey) d.addCallback(startFakeSession) d.addCallback( - lambda dummy: self.setParam( + lambda __: self.setParam( C.PROFILE_PASS_PATH[1], password, C.PROFILE_PASS_PATH[0], profile_key=name ) ) d.addCallback(stopFakeSession) - d.addCallback(lambda dummy: self.auth_sessions.profileDelUnique(name)) + d.addCallback(lambda __: self.auth_sessions.profileDelUnique(name)) return d def asyncDeleteProfile(self, name, force=False): @@ -596,7 +596,7 @@ @return: a Deferred instance """ - def cleanMemory(dummy): + def cleanMemory(__): self.auth_sessions.profileDelUnique(name) try: del self._entities_cache[name] @@ -1100,7 +1100,7 @@ return d.addCallback(cb) - def done(dummy): + def done(__): log.debug( _(u"Personal data (%(ns)s, %(key)s) has been successfuly encrypted") % {"ns": C.MEMORY_CRYPTO_NAMESPACE, "key": data_key} diff -r 92af49cde255 -r 378188abe941 sat/memory/params.py --- a/sat/memory/params.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/memory/params.py Fri Jan 11 11:13:15 2019 +0100 @@ -294,7 +294,7 @@ if ( len(cat_node.childNodes) == to_remove_count ): # remove empty category - for dummy in xrange(0, to_remove_count): + for __ in xrange(0, to_remove_count): to_remove.pop() to_remove.append(cat_node) for node in to_remove: @@ -714,7 +714,7 @@ prof_xml.unlink() dlist = defer.gatherResults(names_d_list) - dlist.addCallback(lambda dummy: ret) + dlist.addCallback(lambda __: ret) return ret d = self._constructProfileXml(security_limit, "", profile) @@ -1071,7 +1071,7 @@ profile=profile, ) d.addCallback( - lambda dummy: PasswordHasher.hash(value) + lambda __: PasswordHasher.hash(value) ) # profile password is hashed (empty value stays empty) elif value: # other non empty passwords are encrypted with the personal key d = BlockCipher.encrypt(personal_key, value) diff -r 92af49cde255 -r 378188abe941 sat/memory/persistent.py --- a/sat/memory/persistent.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/memory/persistent.py Fri Jan 11 11:13:15 2019 +0100 @@ -59,7 +59,7 @@ """ d = self.storage.getPrivates(self.namespace, binary=self.binary, profile=self.profile) d.addCallback(self._setCache) - d.addCallback(lambda dummy: self) + d.addCallback(lambda __: self) return d def iteritems(self): diff -r 92af49cde255 -r 378188abe941 sat/memory/sqlite.py --- a/sat/memory/sqlite.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/memory/sqlite.py Fri Jan 11 11:13:15 2019 +0100 @@ -289,7 +289,7 @@ def setComponent(profile_id): id_ = profile_id[0][0] d_comp = self.dbpool.runQuery("INSERT INTO components(profile_id, entry_point) VALUES (?, ?)", (id_, component)) - d_comp.addCallback(lambda dummy: profile_id) + d_comp.addCallback(lambda __: profile_id) return d_comp def profile_created(profile_id): @@ -401,7 +401,7 @@ ## History - def _addToHistoryCb(self, dummy, data): + def _addToHistoryCb(self, __, data): # Message metadata were successfuly added to history # now we can add message and subject uid = data['uid'] @@ -409,7 +409,7 @@ for lang, value in data[key].iteritems(): d = self.dbpool.runQuery("INSERT INTO {key}(history_uid, {key}, language) VALUES (?,?,?)".format(key=key), (uid, value, lang or None)) - d.addErrback(lambda dummy: log.error(_(u"Can't save following {key} in history (uid: {uid}, lang:{lang}): {value}".format( + d.addErrback(lambda __: log.error(_(u"Can't save following {key} in history (uid: {uid}, lang:{lang}): {value}".format( key=key, uid=uid, lang=lang, value=value)))) try: thread = data['extra']['thread'] @@ -419,7 +419,7 @@ thread_parent = data['extra'].get('thread_parent') d = self.dbpool.runQuery("INSERT INTO thread(history_uid, thread_id, parent_id) VALUES (?,?,?)", (uid, thread, thread_parent)) - d.addErrback(lambda dummy: log.error(_(u"Can't save following thread in history (uid: {uid}): thread:{thread}), parent:{parent}".format( + d.addErrback(lambda __: log.error(_(u"Can't save following thread in history (uid: {uid}): thread:{thread}), parent:{parent}".format( uid=uid, thread=thread, parent=thread_parent)))) def _addToHistoryEb(self, failure_, data): @@ -1362,7 +1362,7 @@ if rows: log.info("fixing duplicate timestamp") fixed = [] - for timestamp, dummy in rows: + for timestamp, __ in rows: ids_rows = yield self.dbpool.runQuery("SELECT id from history where timestamp=?", (timestamp,)) for idx, (id_,) in enumerate(ids_rows): fixed.append(id_) @@ -1486,7 +1486,7 @@ list_.append(d) d_list = defer.DeferredList(list_) - d_list.addCallback(lambda dummy: ret) + d_list.addCallback(lambda __: ret) return d_list def updateLiberviaConf(values): @@ -1507,6 +1507,6 @@ d = self.dbpool.runQuery("SELECT id FROM profiles WHERE name='libervia'") d.addCallback(updateLiberviaConf) - d.addCallback(lambda dummy: self.dbpool.runQuery("SELECT profile_id,value FROM param_ind WHERE category=? AND name=?", xmpp_pass_path)) + d.addCallback(lambda __: self.dbpool.runQuery("SELECT profile_id,value FROM param_ind WHERE category=? AND name=?", xmpp_pass_path)) d.addCallback(encrypt_values) return d diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_blog_import.py --- a/sat/plugins/plugin_blog_import.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_blog_import.py Fri Jan 11 11:13:15 2019 +0100 @@ -306,7 +306,7 @@ filename = filename.replace( u"%", u"_" ) # FIXME: tmp workaround for a bug in prosody http upload - dummy, download_d = yield self._u.upload( + __, download_d = yield self._u.upload( client, tmp_file, filename, options=upload_options ) download_url = yield download_d diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_comp_file_sharing.py --- a/sat/plugins/plugin_comp_file_sharing.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_comp_file_sharing.py Fri Jan 11 11:13:15 2019 +0100 @@ -92,7 +92,7 @@ os.makedirs(path) @defer.inlineCallbacks - def _fileTransferedCb(self, dummy, client, peer_jid, file_data, file_path): + def _fileTransferedCb(self, __, client, peer_jid, file_data, file_path): """post file reception tasks on file is received, this method create hash/thumbnails if necessary diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_exp_events.py --- a/sat/plugins/plugin_exp_events.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_exp_events.py Fri Jan 11 11:13:15 2019 +0100 @@ -612,7 +612,7 @@ # first we authorize our invitee to see the nodes of interest yield self._p.setNodeAffiliations(client, service, node, {invitee_jid: u"member"}) log.debug(_(u"affiliation set on event node")) - dummy, event_data = yield self.eventGet(client, service, node, item_id) + __, event_data = yield self.eventGet(client, service, node, item_id) log.debug(_(u"got event data")) invitees_service = jid.JID(event_data["invitees_service"]) invitees_node = event_data["invitees_node"] @@ -625,7 +625,7 @@ yield self._p.setNodeAffiliations( client, blog_service, blog_node, {invitee_jid: u"member"} ) - blog_items, dummy = yield self._b.mbGet(client, blog_service, blog_node, None) + blog_items, __ = yield self._b.mbGet(client, blog_service, blog_node, None) for item in blog_items: try: diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_exp_jingle_stream.py --- a/sat/plugins/plugin_exp_jingle_stream.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_exp_jingle_stream.py Fri Jan 11 11:13:15 2019 +0100 @@ -291,7 +291,7 @@ log.warning(u"FIXME: unmanaged action {}".format(action)) return desc_elt - def _finishedCb(self, dummy, client, session, content_name, content_data): + def _finishedCb(self, __, client, session, content_name, content_data): log.info(u"Pipe transfer completed") self._j.contentTerminate(client, session, content_name) content_data["stream_object"].stopStream() diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_merge_req_mercurial.py --- a/sat/plugins/plugin_merge_req_mercurial.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_merge_req_mercurial.py Fri Jan 11 11:13:15 2019 +0100 @@ -121,8 +121,8 @@ def check(self, repository): d = MercurialProtocol.run(repository, 'identify') - d.addCallback(lambda dummy: True) - d.addErrback(lambda dummy: False) + d.addCallback(lambda __: True) + d.addErrback(lambda __: False) return d def export(self, repository): diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_misc_account.py --- a/sat/plugins/plugin_misc_account.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_misc_account.py Fri Jan 11 11:13:15 2019 +0100 @@ -225,7 +225,7 @@ @return Deferred """ d = self.createProfile(password, jid_s, profile) - d.addCallback(lambda dummy: self.sendEmails(email, profile)) + d.addCallback(lambda __: self.sendEmails(email, profile)) return d def createProfile(self, password, jid_s, profile): @@ -246,7 +246,7 @@ return defer.fail(Failure(exceptions.ConflictError)) d = self.host.memory.createProfile(profile, password) - d.addCallback(lambda dummy: self.profileCreated(password, jid_s, profile)) + d.addCallback(lambda __: self.profileCreated(password, jid_s, profile)) return d def profileCreated(self, password, jid_s, profile): @@ -267,7 +267,7 @@ jid_ = jid.JID(jid_s) d = self.host.plugins["XEP-0077"].registerNewAccount(jid_, password) - def setParams(dummy): + def setParams(__): self.host.memory.setParam( "JabberID", jid_s, "Connection", profile_key=profile ) @@ -280,9 +280,9 @@ self.host.memory.asyncDeleteProfile(profile) return failure - d.addCallback(lambda dummy: self.host.memory.startSession(password, profile)) + d.addCallback(lambda __: self.host.memory.startSession(password, profile)) d.addCallback(setParams) - d.addCallback(lambda dummy: self.host.memory.stopSession(profile)) + d.addCallback(lambda __: self.host.memory.stopSession(profile)) d.addErrback(removeProfile) return d @@ -317,12 +317,12 @@ admins_emails_txt = u", ".join([u"<" + addr + u">" for addr in admins_emails]) d_admin.addCallbacks( - lambda dummy: log.debug( + lambda __: log.debug( u"Account creation notification sent to admin(s) {}".format( admins_emails_txt ) ), - lambda dummy: log.error( + lambda __: log.error( u"Failed to send account creation notification to admin {}".format( admins_emails_txt ) @@ -343,7 +343,7 @@ # FIXME: delete the profile if the email could not been sent? d_user = sat_email.sendEmail(self.host, [email], subject, body) d_user.addCallbacks( - lambda dummy: log.debug( + lambda __: log.debug( u"Account creation confirmation sent to <{}>".format(email) ), self._sendEmailEb, @@ -485,7 +485,7 @@ @param password (str): the new password @param profile (str): %(doc_profile)s """ - session_id, dummy = self._sessions.newSession( + session_id, __ = self._sessions.newSession( {"new_password": password}, profile=profile ) form_ui = xml_tools.XMLUI( @@ -511,7 +511,7 @@ password = self._sessions.profileGet(data["session_id"], profile)["new_password"] del self._sessions[data["session_id"]] - def passwordChanged(dummy): + def passwordChanged(__): d = self.host.memory.setParam( C.PROFILE_PASS_PATH[1], password, @@ -519,7 +519,7 @@ profile_key=profile, ) d.addCallback( - lambda dummy: self.host.memory.setParam( + lambda __: self.host.memory.setParam( "Password", password, "Connection", profile_key=profile ) ) @@ -576,7 +576,7 @@ """ client = self.host.getClient(profile) - def userDeleted(dummy): + def userDeleted(__): # FIXME: client should be disconnected at this point, so 2 next loop should be removed (to be confirmed) for jid_ in client.roster._jids: # empty roster @@ -594,7 +594,7 @@ d = self.host.plugins["GROUPBLOG"].deleteAllGroupBlogsAndComments( profile_key=profile ) - d.addCallback(lambda dummy: delete_profile()) + d.addCallback(lambda __: delete_profile()) else: delete_profile() @@ -739,7 +739,7 @@ d = self.createProfile(password, jid_s, jid_s) d.addCallback( - lambda dummy: self.host.memory.getProfileName(jid_s) + lambda __: self.host.memory.getProfileName(jid_s) ) # checks if the profile has been successfuly created d.addCallback(self.host.connect, password, {}, 0) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_misc_nat-port.py --- a/sat/plugins/plugin_misc_nat-port.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_misc_nat-port.py Fri Jan 11 11:13:15 2019 +0100 @@ -105,7 +105,7 @@ @return (None, str): found IP address, or None of something got wrong """ - def getIP(dummy): + def getIP(__): if self._upnp is None: return None # lanaddr can be the empty string if not found, diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_misc_register_account.py --- a/sat/plugins/plugin_misc_register_account.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_misc_register_account.py Fri Jan 11 11:13:15 2019 +0100 @@ -81,7 +81,7 @@ session_data["user"], host, resource = jid.parse(session_data["JabberID"]) session_data["server"] = session_data[C.FORCE_SERVER_PARAM] or host - session_id, dummy = self._sessions.newSession(session_data, profile=profile) + session_id, __ = self._sessions.newSession(session_data, profile=profile) form_ui = xml_tools.XMLUI( "form", title=D_("Register new account"), @@ -129,7 +129,7 @@ def _registerNewAccount(self, client, jid_, password, email, server): #  FIXME: port is not set here - def registeredCb(dummy): + def registeredCb(__): xmlui = xml_tools.XMLUI(u"popup", title=D_(u"Confirmation")) xmlui.addText(D_("Registration successful.")) return {"xmlui": xmlui.toXml()} diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_misc_room_game.py --- a/sat/plugins/plugin_misc_room_game.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_misc_room_game.py Fri Jan 11 11:13:15 2019 +0100 @@ -488,7 +488,7 @@ user_jid = self.host.getJidNStream(profile)[0] d = self.host.plugins["XEP-0045"].join(room_jid, user_jid.user, {}, profile) return d.addCallback( - lambda dummy: self._createOrInvite(client, room_jid, other_players) + lambda __: self._createOrInvite(client, room_jid, other_players) ) def userJoinedTrigger(self, room, user, profile): @@ -520,7 +520,7 @@ ) return True other_players = self.invitations[room_jid][batch][1] - (auth, nicks, dummy) = self._checkWaitAuth(room, other_players) + (auth, nicks, __) = self._checkWaitAuth(room, other_players) if auth: del self.invitations[room_jid][batch] nicks.insert(0, profile_nick) # add the referee diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_misc_upload.py --- a/sat/plugins/plugin_misc_upload.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_misc_upload.py Fri Jan 11 11:13:15 2019 +0100 @@ -87,7 +87,7 @@ """ def uploadCb(data): - progress_id, dummy = data + progress_id, __ = data return {"progress": progress_id} def uploadEb(fail): diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0033.py --- a/sat/plugins/plugin_xep_0033.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0033.py Fri Jan 11 11:13:15 2019 +0100 @@ -131,7 +131,7 @@ raise failure.Failure(exceptions.CancelError(u"Cancelled by XEP-0033")) d = self.host.findFeaturesSet(client, [NS_ADDRESS]) - d.addCallbacks(discoCallback, lambda dummy: discoCallback(None)) + d.addCallbacks(discoCallback, lambda __: discoCallback(None)) return d post_xml_treatments.addCallback(treatment) @@ -194,7 +194,7 @@ ) d.callback([NS_ADDRESS]) defer_list.append(d) - d = defer.Deferred().addCallback(lambda dummy: self.internal_data.pop(timestamp)) + d = defer.Deferred().addCallback(lambda __: self.internal_data.pop(timestamp)) defer.DeferredList(defer_list).chainDeferred(d) def messageReceivedTrigger(self, client, message, post_treat): diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0048.py --- a/sat/plugins/plugin_xep_0048.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0048.py Fri Jan 11 11:13:15 2019 +0100 @@ -265,7 +265,7 @@ # FIXME: failure are badly managed in plugin XEP-0045. Plugin XEP-0045 need to be fixed before managing errors correctly here return {} - d.addCallbacks(lambda dummy: {}, join_eb) + d.addCallbacks(lambda __: {}, join_eb) return d def _bookmarksMenu(self, data, profile): @@ -325,7 +325,7 @@ except KeyError: raise exceptions.InternalError("Can't find mandatory key") d = self.addBookmark(XEP_0048.MUC_TYPE, location, bm_data, profile_key=profile) - d.addCallback(lambda dummy: {}) + d.addCallback(lambda __: {}) return d @defer.inlineCallbacks @@ -431,7 +431,7 @@ ret = {} ret_d = defer.succeed(ret) - def fillBookmarks(dummy, _storage_location): + def fillBookmarks(__, _storage_location): bookmarks_ori = getattr(client, "bookmarks_" + _storage_location) if bookmarks_ori is None: return ret @@ -449,7 +449,7 @@ else: d = defer.succeed(None) d.addCallback(fillBookmarks, _storage_location) - ret_d.addCallback(lambda dummy: d) + ret_d.addCallback(lambda __: d) return ret_d diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0054.py --- a/sat/plugins/plugin_xep_0054.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0054.py Fri Jan 11 11:13:15 2019 +0100 @@ -386,7 +386,7 @@ ) return d - def _getCardCb(self, dummy, client, entity): + def _getCardCb(self, __, client, entity): try: return client._cache_0054[entity.full()]["avatar"] except KeyError: @@ -395,7 +395,7 @@ def _getAvatar(self, entity, cache_only, hash_only, profile): client = self.host.getClient(profile) d = self.getAvatar(client, jid.JID(entity), cache_only, hash_only) - d.addErrback(lambda dummy: "") + d.addErrback(lambda __: "") return d @@ -442,7 +442,7 @@ if full_path is None: d.addCallback(client.cache.getFilePath) else: - d.addCallback(lambda dummy: full_path) + d.addCallback(lambda __: full_path) return d @defer.inlineCallbacks @@ -573,7 +573,7 @@ def getDiscoItems(self, requestor, target, nodeIdentifier=""): return [] - def _checkAvatarHash(self, dummy, client, entity, given_hash): + def _checkAvatarHash(self, __, client, entity, given_hash): """check that hash in cash (i.e. computed hash) is the same as given one""" # XXX: if they differ, the avater will be requested on each connection # TODO: try to avoid re-requesting avatar in this case diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0055.py --- a/sat/plugins/plugin_xep_0055.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0055.py Fri Jan 11 11:13:15 2019 +0100 @@ -146,9 +146,9 @@ d = self._addSimpleSearchUI(services, main_ui, data, profile) d.addCallback( - lambda dummy: self._addAdvancedSearchUI(services, main_ui, data, profile) + lambda __: self._addAdvancedSearchUI(services, main_ui, data, profile) ) - return d.addCallback(lambda dummy: {"xmlui": main_ui.toXml()}) + return d.addCallback(lambda __: {"xmlui": main_ui.toXml()}) def _addSimpleSearchUI(self, services, main_ui, data, profile): """Add to the main UI a tab for the simple search. @@ -160,7 +160,7 @@ @param data (dict): form data without SAT_FORM_PREFIX @param profile (unicode): %(doc_profile)s - @return: a dummy Deferred + @return: a __ Deferred """ service_jid = services[ 0 @@ -219,7 +219,7 @@ @param data (dict): form data without SAT_FORM_PREFIX @param profile (unicode): %(doc_profile)s - @return: a dummy Deferred + @return: a __ Deferred """ sub_cont = main_ui.main_container.addTab( "advanced_search", @@ -282,7 +282,7 @@ @param data (dict): form data without SAT_FORM_PREFIX @param profile (unicode): %(doc_profile)s - @return: a dummy Deferred + @return: a __ Deferred """ field_list = data_form.Form.fromElement(form_elt).fieldList adv_fields = [field.var for field in field_list if field.var] diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0065.py --- a/sat/plugins/plugin_xep_0065.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0065.py Fri Jan 11 11:13:15 2019 +0100 @@ -699,7 +699,7 @@ def getSession(self): return self.session - def startTransfer(self, dummy=None, chunk_size=None): + def startTransfer(self, __=None, chunk_size=None): self.session[TIMER_KEY].cancel() self._protocol_instance.startTransfer(chunk_size) @@ -1019,7 +1019,7 @@ ) if connection_cb is not None: d.addCallback( - lambda dummy, candidate=candidate, client=client: connection_cb( + lambda __, candidate=candidate, client=client: connection_cb( client, candidate ) ) @@ -1203,7 +1203,7 @@ log.info(u"A Socks5 proxy is used") d = self.connectCandidate(client, candidate, session_data["hash"]) d.addCallback( - lambda dummy: candidate.activate( + lambda __: candidate.activate( session_data["id"], session_data["peer_jid"], client ) ) @@ -1211,7 +1211,7 @@ else: d = defer.succeed(None) - d.addCallback(lambda dummy: candidate.startTransfer(session_data["hash"])) + d.addCallback(lambda __: candidate.startTransfer(session_data["hash"])) def _activationEb(self, failure): log.warning(u"Proxy activation error: {}".format(failure.value)) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0071.py --- a/sat/plugins/plugin_xep_0071.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0071.py Fri Jan 11 11:13:15 2019 +0100 @@ -130,7 +130,7 @@ ): continue treat_d.addCallback( - lambda dummy: self._s.convert( + lambda __: self._s.convert( body_elt.toXml(), self.SYNTAX_XHTML_IM, safe=True ) ) @@ -138,7 +138,7 @@ defers.append(treat_d) d_list = defer.DeferredList(defers) - d_list.addCallback(lambda dummy: data) + d_list.addCallback(lambda __: data) return d_list def _fill_body_text(self, text, data, lang): @@ -193,7 +193,7 @@ else: exceptions.InternalError(u"xhtml or rich should be present at this point") d_list = defer.DeferredList(defers) - d_list.addCallback(lambda dummy: data) + d_list.addCallback(lambda __: data) return d_list def messageReceivedTrigger(self, client, message, post_treat): diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0077.py --- a/sat/plugins/plugin_xep_0077.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0077.py Fri Jan 11 11:13:15 2019 +0100 @@ -252,7 +252,7 @@ iq_elt = self.buildRegisterIQ(client.xmlstream, client.jid, new_password) d = iq_elt.send(client.jid.host) d.addCallback( - lambda dummy: self.host.memory.setParam( + lambda __: self.host.memory.setParam( "Password", new_password, "Connection", profile_key=client.profile ) ) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0092.py --- a/sat/plugins/plugin_xep_0092.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0092.py Fri Jan 11 11:13:15 2019 +0100 @@ -80,7 +80,7 @@ """ client = self.host.getClient(profile_key) - def getVersion(dummy): + def getVersion(__): iq_elt = compat.IQ(client.xmlstream, "get") iq_elt["to"] = jid_.full() iq_elt.addElement("query", NS_VERSION) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0096.py --- a/sat/plugins/plugin_xep_0096.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0096.py Fri Jan 11 11:13:15 2019 +0100 @@ -257,7 +257,7 @@ # misc_elts.append(range_elt) self._si.acceptStream(client, iq_elt, feature_elt, misc_elts) - def _transferCb(self, dummy, client, data): + def _transferCb(self, __, client, data): """Called by the stream method when transfer successfuly finished @param data: session data @@ -382,7 +382,7 @@ else: log.error(u"Error while proposing stream: {}".format(failure)) - def _sendCb(self, dummy, client, sid, stream_object): + def _sendCb(self, __, client, sid, stream_object): log.info( _(u"transfer {sid} successfuly finished [{profile}]").format( sid=sid, profile=client.profile diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0115.py --- a/sat/plugins/plugin_xep_0115.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0115.py Fri Jan 11 11:13:15 2019 +0100 @@ -170,7 +170,7 @@ % {"hash_method": c_hash, "jid": from_jid, "node": c_node} ) - def cb(dummy): + def cb(__): computed_hash = self.host.memory.getEntityDatum( from_jid, C.ENTITY_CAP_HASH, self.profile ) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0166.py --- a/sat/plugins/plugin_xep_0166.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0166.py Fri Jan 11 11:13:15 2019 +0100 @@ -876,7 +876,7 @@ d_list = defer.DeferredList(defers_list) d_list.addCallback( - lambda dummy: self._callPlugins( + lambda __: self._callPlugins( client, XEP_0166.A_PREPARE_RESPONDER, session, @@ -884,14 +884,14 @@ elements=False, ) ) - d_list.addCallback(lambda dummy: iq_elt.send()) + d_list.addCallback(lambda __: iq_elt.send()) - def changeState(dummy, session): + def changeState(__, session): session["state"] = STATE_ACTIVE d_list.addCallback(changeState, session) d_list.addCallback( - lambda dummy: self._callPlugins( + lambda __: self._callPlugins( client, XEP_0166.A_ACCEPTED_ACK, session, elements=False ) ) @@ -920,7 +920,7 @@ ) terminate_dlist = defer.DeferredList(terminate_defers) - terminate_dlist.addCallback(lambda dummy: self._delSession(client, session["id"])) + terminate_dlist.addCallback(lambda __: self._delSession(client, session["id"])) client.send(xmlstream.toResponse(request, "result")) def onSessionAccept(self, client, request, jingle_elt, session): @@ -951,7 +951,7 @@ # after negociations we start the transfer negociate_dlist.addCallback( - lambda dummy: self._callPlugins( + lambda __: self._callPlugins( client, XEP_0166.A_START, session, app_method_name=None, elements=False ) ) @@ -1109,7 +1109,7 @@ # after negociations we start the transfer negociate_dlist.addCallback( - lambda dummy: self._callPlugins( + lambda __: self._callPlugins( client, XEP_0166.A_START, session, app_method_name=None, elements=False ) ) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0231.py --- a/sat/plugins/plugin_xep_0231.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0231.py Fri Jan 11 11:13:15 2019 +0100 @@ -161,7 +161,7 @@ # so we use the deferred d = self.requestData(client, jid.JID(message_elt["from"]), cid) d.addCallback(partial(self._setImgEltSrc, img_elt=img_elt)) - treat_d.addCallback(lambda dummy: d) + treat_d.addCallback(lambda __: d) def onComponentRequest(self, iq_elt, client): """cache data is retrieve from common cache for components""" diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0234.py --- a/sat/plugins/plugin_xep_0234.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0234.py Fri Jan 11 11:13:15 2019 +0100 @@ -759,7 +759,7 @@ pass return True - def _finishedCb(self, dummy, client, session, content_name, content_data): + def _finishedCb(self, __, client, session, content_name, content_data): log.info(u"File transfer terminated") if content_data["senders"] != session["role"]: # we terminate the session only if we are the receiver, diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0260.py --- a/sat/plugins/plugin_xep_0260.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0260.py Fri Jan 11 11:13:15 2019 +0100 @@ -291,7 +291,7 @@ client, choosed_candidate, transport_data["session_hash"] ) d.addCallback( - lambda dummy: choosed_candidate.activate( + lambda __: choosed_candidate.activate( transport_data["sid"], session["peer_jid"], client ) ) @@ -308,7 +308,7 @@ if content_data["senders"] == session["role"]: # we can now start the stream transfer (or start it after proxy activation) d.addCallback( - lambda dummy: choosed_candidate.startTransfer( + lambda __: choosed_candidate.startTransfer( transport_data["session_hash"] ) ) diff -r 92af49cde255 -r 378188abe941 sat/plugins/plugin_xep_0363.py --- a/sat/plugins/plugin_xep_0363.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/plugins/plugin_xep_0363.py Fri Jan 11 11:13:15 2019 +0100 @@ -148,7 +148,7 @@ profile=C.PROF_KEY_NONE, ): assert os.path.isabs(filepath) and os.path.isfile(filepath) - progress_id_d, dummy = self.fileHTTPUpload( + progress_id_d, __ = self.fileHTTPUpload( filepath, filename or None, jid.JID(upload_jid) if upload_jid else None, @@ -239,7 +239,7 @@ ) return d - def _uploadCb(self, dummy, sat_file, slot, download_d): + def _uploadCb(self, __, sat_file, slot, download_d): """Called once file is successfully uploaded @param sat_file(SatFile): file used for the upload diff -r 92af49cde255 -r 378188abe941 sat/stdui/ui_profile_manager.py --- a/sat/stdui/ui_profile_manager.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/stdui/ui_profile_manager.py Fri Jan 11 11:13:15 2019 +0100 @@ -91,7 +91,7 @@ first = False eb_profile = None d = self.host.memory.startSession(password, profile) - d.addCallback(lambda dummy: {"validated": C.BOOL_TRUE}) + d.addCallback(lambda __: {"validated": C.BOOL_TRUE}) d.addErrback(self._startSessionEb, first, eb_profile) return d @@ -143,7 +143,7 @@ d = self.host.memory.setParam( "Password", xmpp_password, "Connection", profile_key=profile ) - d.addCallback(lambda dummy: self.host.connect(profile)) - d.addCallback(lambda dummy: {}) - d.addErrback(lambda dummy: self._changeXMPPPassword({}, profile)) + d.addCallback(lambda __: self.host.connect(profile)) + d.addCallback(lambda __: {}) + d.addErrback(lambda __: self._changeXMPPPassword({}, profile)) return d diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_misc_groupblog.py --- a/sat/test/test_plugin_misc_groupblog.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_misc_groupblog.py Fri Jan 11 11:13:15 2019 +0100 @@ -188,11 +188,11 @@ d = self.psclient.items(SERVICE, NODE_ID) d.addCallback(lambda items: self.assertEqual(len(items), 0)) d.addCallback( - lambda dummy: self.plugin.sendGroupBlog( + lambda __: self.plugin.sendGroupBlog( "PUBLIC", [], "test", {}, C.PROFILE[0] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) return d.addCallback(lambda items: self.assertEqual(len(items), 1)) def test_deleteGroupBlog(self): @@ -207,7 +207,7 @@ d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.deleteGroupBlog( + lambda __: self.plugin.deleteGroupBlog( pub_data, COMMENTS_NODE_URL_1, profile_key=C.PROFILE[0] ) ) @@ -220,11 +220,11 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.updateGroupBlog( + lambda __: self.plugin.updateGroupBlog( pub_data, COMMENTS_NODE_URL_1, new_text, {}, profile_key=C.PROFILE[0] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) return d.addCallback( lambda items: self.assertEqual( "".join(items[0].entry.title.children), new_text @@ -236,18 +236,18 @@ d = self.psclient.items(SERVICE, NODE_ID) d.addCallback(lambda items: self.assertEqual(len(items), 0)) d.addCallback( - lambda dummy: self.plugin.sendGroupBlogComment( + lambda __: self.plugin.sendGroupBlogComment( COMMENTS_NODE_URL_1, "test", {}, profile_key=C.PROFILE[0] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) return d.addCallback(lambda items: self.assertEqual(len(items), 1)) def test_getGroupBlogs(self): self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getGroupBlogs(PUBLISHER, profile_key=C.PROFILE[0]) + lambda __: self.plugin.getGroupBlogs(PUBLISHER, profile_key=C.PROFILE[0]) ) result = ( [ITEM_DATA_1()], @@ -259,7 +259,7 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getGroupBlogs( + lambda __: self.plugin.getGroupBlogs( PUBLISHER, count_comments=False, profile_key=C.PROFILE[0] ) ) @@ -273,7 +273,7 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getGroupBlogs( + lambda __: self.plugin.getGroupBlogs( PUBLISHER, [ITEM_ID_1], profile_key=C.PROFILE[0] ) ) @@ -287,7 +287,7 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getGroupBlogs( + lambda __: self.plugin.getGroupBlogs( PUBLISHER, rsm_data={"max_": 1}, profile_key=C.PROFILE[0] ) ) @@ -301,10 +301,10 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1]) + lambda __: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1]) ) d.addCallback( - lambda dummy: self.plugin.getGroupBlogsWithComments( + lambda __: self.plugin.getGroupBlogsWithComments( PUBLISHER, [], profile_key=C.PROFILE[0] ) ) @@ -331,12 +331,12 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2] ) ) d.addCallback( - lambda dummy: self.plugin.getGroupBlogsWithComments( + lambda __: self.plugin.getGroupBlogsWithComments( PUBLISHER, [], profile_key=C.PROFILE[0] ) ) @@ -364,7 +364,7 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getGroupBlogsAtom( + lambda __: self.plugin.getGroupBlogsAtom( PUBLISHER, {"max_": 1}, profile_key=C.PROFILE[0] ) ) @@ -379,7 +379,7 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.plugin.getMassiveGroupBlogs( + lambda __: self.plugin.getMassiveGroupBlogs( "JID", [jid.JID(PUBLISHER)], {"max_": 1}, profile_key=C.PROFILE[0] ) ) @@ -403,12 +403,12 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2] ) ) d.addCallback( - lambda dummy: self.plugin.getMassiveGroupBlogs( + lambda __: self.plugin.getMassiveGroupBlogs( "JID", [jid.JID(PUBLISHER)], {"max_": 1}, profile_key=C.PROFILE[0] ) ) @@ -432,10 +432,10 @@ self._initialise(C.PROFILE[0]) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1]) + lambda __: self.psclient.publish(SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1]) ) d.addCallback( - lambda dummy: self.plugin.getGroupBlogComments( + lambda __: self.plugin.getGroupBlogComments( SERVICE, COMMENTS_NODE_ID_1, {"max_": 1}, profile_key=C.PROFILE[0] ) ) @@ -474,26 +474,26 @@ self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER)) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) d.addCallback( - lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) + lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) ) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) def clean(res): @@ -502,17 +502,17 @@ ] return res - d.addCallback(lambda dummy: self.plugin.deleteAllGroupBlogs(C.PROFILE[0])) + d.addCallback(lambda __: self.plugin.deleteAllGroupBlogs(C.PROFILE[0])) d.addCallback(clean) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) return d @@ -522,26 +522,26 @@ self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER)) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) d.addCallback( - lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) + lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) ) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) def clean(res): @@ -550,17 +550,17 @@ ] return res - d.addCallback(lambda dummy: self.plugin.deleteAllGroupBlogsComments(C.PROFILE[0])) + d.addCallback(lambda __: self.plugin.deleteAllGroupBlogsComments(C.PROFILE[0])) d.addCallback(clean) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) return d @@ -569,26 +569,26 @@ self.host.profiles[C.PROFILE[0]].roster.addItem(jid.JID(OTHER_PUBLISHER)) d = self.psclient.publish(SERVICE, NODE_ID, [ITEM_1]) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_1, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) d.addCallback( - lambda dummy: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) + lambda __: self.psclient.publish(SERVICE, OTHER_NODE_ID, [ITEM_2]) ) d.addCallback( - lambda dummy: self.psclient.publish( + lambda __: self.psclient.publish( SERVICE, COMMENTS_NODE_ID_2, [COMMENT_1, COMMENT_2] ) ) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 2)) def clean(res): @@ -598,17 +598,17 @@ return res d.addCallback( - lambda dummy: self.plugin.deleteAllGroupBlogsAndComments(C.PROFILE[0]) + lambda __: self.plugin.deleteAllGroupBlogsAndComments(C.PROFILE[0]) ) d.addCallback(clean) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_1)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, OTHER_NODE_ID)) + d.addCallback(lambda __: self.psclient.items(SERVICE, OTHER_NODE_ID)) d.addCallback(lambda items: self.assertEqual(len(items), 1)) - d.addCallback(lambda dummy: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) + d.addCallback(lambda __: self.psclient.items(SERVICE, COMMENTS_NODE_ID_2)) d.addCallback(lambda items: self.assertEqual(len(items), 0)) return d diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_xep_0033.py --- a/sat/test/test_plugin_xep_0033.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_xep_0033.py Fri Jan 11 11:13:15 2019 +0100 @@ -145,7 +145,7 @@ d.addCallback(cb, to_jid) d_list.append(d) - def cb_list(dummy): + def cb_list(__): msg = "/!\ see the comments in XEP_0033.sendAndStoreMessage" sent_recipients = [ JID(elt["to"]) for elt in self.host.getSentMessages(PROFILE_INDEX) @@ -187,7 +187,7 @@ self.host.addFeature(JID(JID_STR_TO), plugin.NS_ADDRESS, PROFILE) data = self._get_mess_data() d = self._trigger(data) - return d.addCallback(lambda dummy: self._checkSentAndStored()) + return d.addCallback(lambda __: self._checkSentAndStored()) def test_messageSendTriggerFeatureFullySupported(self): # feature is supported by all target servers @@ -197,7 +197,7 @@ self.host.addFeature(JID(JID(dest).host), plugin.NS_ADDRESS, PROFILE) data = self._get_mess_data() d = self._trigger(data) - return d.addCallback(lambda dummy: self._checkSentAndStored()) + return d.addCallback(lambda __: self._checkSentAndStored()) def test_messageSendTriggerFixWrongEntity(self): # check that a wrong recipient entity is fixed by the backend @@ -208,4 +208,4 @@ data = self._get_mess_data() data["to"] = JID(JID_STR_X_TO) d = self._trigger(data) - return d.addCallback(lambda dummy: self._checkSentAndStored()) + return d.addCallback(lambda __: self._checkSentAndStored()) diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_xep_0085.py --- a/sat/test/test_plugin_xep_0085.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_xep_0085.py Fri Jan 11 11:13:15 2019 +0100 @@ -98,7 +98,7 @@ post_treatments.callback(mess_data) d_list.append(post_treatments) - def cb_list(dummy): # cancel the timer to not block the process + def cb_list(__): # cancel the timer to not block the process self.plugin.map[Const.PROFILE[0]][Const.JID[0]].timer.cancel() return defer.DeferredList(d_list).addCallback(cb_list) diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_xep_0297.py --- a/sat/test/test_plugin_xep_0297.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_xep_0297.py Fri Jan 11 11:13:15 2019 +0100 @@ -82,7 +82,7 @@ profile_key=C.PROFILE[0], ) d.addCallback( - lambda dummy: self.assertEqualXML( + lambda __: self.assertEqualXML( self.host.getSentMessageXml(0), output, True ) ) diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_xep_0313.py --- a/sat/test/test_plugin_xep_0313.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_xep_0313.py Fri Jan 11 11:13:15 2019 +0100 @@ -57,7 +57,7 @@ ) d = self.plugin.queryArchive(self.client, MAMRequest(), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -74,7 +74,7 @@ self.client, MAMRequest(node="fdp/submitted/capulet.lit/sonnets"), SERVICE_JID ) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -99,7 +99,7 @@ form = buildForm(with_jid=JID("juliet@capulet.lit")) d = self.plugin.queryArchive(self.client, MAMRequest(form), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -129,7 +129,7 @@ form = buildForm(start=start, end=end) d = self.plugin.queryArchive(self.client, MAMRequest(form), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -155,7 +155,7 @@ form = buildForm(start=start) d = self.plugin.queryArchive(self.client, MAMRequest(form), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -185,7 +185,7 @@ rsm = RSMRequest(max_=10) d = self.plugin.queryArchive(self.client, MAMRequest(form, rsm), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -212,7 +212,7 @@ rsm = RSMRequest(max_=10, after=u"09af3-cc343-b409f") d = self.plugin.queryArchive(self.client, MAMRequest(form, rsm), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -227,7 +227,7 @@ ) d = self.plugin.queryFields(self.client, SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -267,7 +267,7 @@ form = buildForm(extra_fields=extra_fields) d = self.plugin.queryArchive(self.client, MAMRequest(form), SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -285,7 +285,7 @@ ) d = self.plugin.getPrefs(self.client, SERVICE_JID) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d @@ -309,6 +309,6 @@ never = [JID("montague@montague.lit")] d = self.plugin.setPrefs(self.client, SERVICE_JID, always=always, never=never) d.addCallback( - lambda dummy: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) + lambda __: self.assertEqualXML(self.host.getSentMessageXml(0), xml, True) ) return d diff -r 92af49cde255 -r 378188abe941 sat/test/test_plugin_xep_0334.py --- a/sat/test/test_plugin_xep_0334.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/test/test_plugin_xep_0334.py Fri Jan 11 11:13:15 2019 +0100 @@ -81,7 +81,7 @@ """ - def cb(dummy): + def cb(__): raise Exception("Errback should not be ran instead of callback!") def eb(failure): diff -r 92af49cde255 -r 378188abe941 sat/tools/sat_defer.py --- a/sat/tools/sat_defer.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat/tools/sat_defer.py Fri Jan 11 11:13:15 2019 +0100 @@ -206,7 +206,7 @@ session_data = self.profileGet(session_id, profile) @defer.inlineCallbacks - def next_cb(dummy): + def next_cb(__): # we got one or several results results = {} filtered_data = [] # used to keep deferreds without results diff -r 92af49cde255 -r 378188abe941 sat_frontends/bridge/bridge_frontend.py --- a/sat_frontends/bridge/bridge_frontend.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/bridge/bridge_frontend.py Fri Jan 11 11:13:15 2019 +0100 @@ -32,7 +32,7 @@ self.fullname = unicode(name) self.message = unicode(message) self.condition = unicode(condition) if condition else "" - self.module, dummy, self.classname = unicode(self.fullname).rpartition(".") + self.module, __, self.classname = unicode(self.fullname).rpartition(".") def __str__(self): message = (": %s" % self.message) if self.message else "" diff -r 92af49cde255 -r 378188abe941 sat_frontends/bridge/pb.py --- a/sat_frontends/bridge/pb.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/bridge/pb.py Fri Jan 11 11:13:15 2019 +0100 @@ -119,7 +119,7 @@ reactor.connectTCP("localhost", 8789, factory) d = factory.getRootObject() d.addCallback(self._set_root) - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) d.addErrback(errback) def register_signal(self, functionName, handler, iface="core"): @@ -137,7 +137,7 @@ def addContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("addContact", entity_jid, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -145,7 +145,7 @@ def asyncDeleteProfile(self, profile, callback=None, errback=None): d = self.root.callRemote("asyncDeleteProfile", profile) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -177,7 +177,7 @@ def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("delContact", entity_jid, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -209,7 +209,7 @@ def disconnect(self, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("disconnect", profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -329,7 +329,7 @@ def getReady(self, callback=None, errback=None): d = self.root.callRemote("getReady") if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -417,7 +417,7 @@ def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None): d = self.root.callRemote("messageEncryptionStart", to_jid, namespace, replace, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -425,7 +425,7 @@ def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None): d = self.root.callRemote("messageEncryptionStop", to_jid, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -433,7 +433,7 @@ def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -449,7 +449,7 @@ def paramsRegisterApp(self, xml, security_limit=-1, app='', callback=None, errback=None): d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -457,7 +457,7 @@ def profileCreate(self, profile, password='', component='', callback=None, errback=None): d = self.root.callRemote("profileCreate", profile, password, component) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -481,7 +481,7 @@ def profileSetDefault(self, profile, callback=None, errback=None): d = self.root.callRemote("profileSetDefault", profile) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -545,7 +545,7 @@ def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -553,7 +553,7 @@ def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -561,7 +561,7 @@ def subscription(self, sub_type, entity, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("subscription", sub_type, entity, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) @@ -569,7 +569,7 @@ def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) if callback is not None: - d.addCallback(lambda dummy: callback()) + d.addCallback(lambda __: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/base.py --- a/sat_frontends/jp/base.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/base.py Fri Jan 11 11:13:15 2019 +0100 @@ -723,7 +723,7 @@ pass else: if start_session: - self.bridge.profileStartSession(self.args.pwd, self.profile, lambda dummy: callback(), cant_start_session) + self.bridge.profileStartSession(self.args.pwd, self.profile, lambda __: callback(), cant_start_session) self._auto_loop = True return elif not self.bridge.profileIsSessionStarted(self.profile): @@ -739,7 +739,7 @@ # a profile can be present without connect option (e.g. on profile creation/deletion) return elif self.args.connect is True: # if connection is asked, we connect the profile - self.bridge.connect(self.profile, self.args.pwd, {}, lambda dummy: callback(), cant_connect) + self.bridge.connect(self.profile, self.args.pwd, {}, lambda __: callback(), cant_connect) self._auto_loop = True return else: diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/cmd_account.py --- a/sat_frontends/jp/cmd_account.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/cmd_account.py Fri Jan 11 11:13:15 2019 +0100 @@ -88,7 +88,7 @@ errback=self.errback, ) - def _session_started(self, dummy): + def _session_started(self, __): self.host.bridge.setParam( "JabberID", self.args.jid, diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/cmd_invitation.py --- a/sat_frontends/jp/cmd_invitation.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/cmd_invitation.py Fri Jan 11 11:13:15 2019 +0100 @@ -201,7 +201,7 @@ if self.args.with_jid: profile = invitation_data[u"guest_profile"] - def session_started(dummy): + def session_started(__): self.host.bridge.asyncGetParamA( u"JabberID", u"Connection", diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/cmd_profile.py --- a/sat_frontends/jp/cmd_profile.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/cmd_profile.py Fri Jan 11 11:13:15 2019 +0100 @@ -87,7 +87,7 @@ self.disp(_(u"Profile deletion cancelled")) self.host.quit(2) - self.host.bridge.asyncDeleteProfile(self.args.profile, callback=lambda dummy: None) + self.host.bridge.asyncDeleteProfile(self.args.profile, callback=lambda __: None) class ProfileInfo(base.CommandBase): @@ -153,7 +153,7 @@ self.parser.add_argument('-C', '--component', type=base.unicode_decoder, default='', help=_(u'set to component import name (entry point) if this is a component')) - def _session_started(self, dummy): + def _session_started(self, __): if self.args.jid: self.host.bridge.setParam("JabberID", self.args.jid, "Connection", profile_key=self.args.profile) xmpp_pwd = self.args.password or self.args.xmpp_password diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/cmd_roster.py --- a/sat_frontends/jp/cmd_roster.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/cmd_roster.py Fri Jan 11 11:13:15 2019 +0100 @@ -90,7 +90,7 @@ print "Nothing to do - there's a from and/or to subscription(s) between profile [%s] and each of its contacts" % self.host.profile elif self.ask_confirmation(no_sub, no_from, no_to): for contact in no_sub + no_from + no_to: - self.host.bridge.delContact(contact, profile_key=self.host.profile, callback=lambda dummy: None, errback=lambda failure: None) + self.host.bridge.delContact(contact, profile_key=self.host.profile, callback=lambda __: None, errback=lambda failure: None) self.host.quit() diff -r 92af49cde255 -r 378188abe941 sat_frontends/jp/xmlui_manager.py --- a/sat_frontends/jp/xmlui_manager.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/jp/xmlui_manager.py Fri Jan 11 11:13:15 2019 +0100 @@ -533,7 +533,7 @@ dialog_factory = WidgetFactory() read_only = False - def show(self, dummy=None): + def show(self, __=None): self.dlg.show() def _xmluiClose(self): diff -r 92af49cde255 -r 378188abe941 sat_frontends/primitivus/chat.py --- a/sat_frontends/primitivus/chat.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/primitivus/chat.py Fri Jan 11 11:13:15 2019 +0100 @@ -703,7 +703,7 @@ default_txt=new_subject if new_subject is not None else self.subject, ) dialog.setCallback("ok", self._onSubjectDialogCb, dialog) - dialog.setCallback("cancel", lambda dummy: self.host.removePopUp(dialog)) + dialog.setCallback("cancel", lambda __: self.host.removePopUp(dialog)) self.host.showPopUp(dialog) diff -r 92af49cde255 -r 378188abe941 sat_frontends/primitivus/profile_manager.py --- a/sat_frontends/primitivus/profile_manager.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/primitivus/profile_manager.py Fri Jan 11 11:13:15 2019 +0100 @@ -124,7 +124,7 @@ self.host.bridge.profileStartSession( "", profile, - callback=lambda dummy: self.newProfileSessionStarted(profile), + callback=lambda __: self.newProfileSessionStarted(profile), errback=self.profileCreationFailure, ) diff -r 92af49cde255 -r 378188abe941 sat_frontends/primitivus/xmlui.py --- a/sat_frontends/primitivus/xmlui.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/primitivus/xmlui.py Fri Jan 11 11:13:15 2019 +0100 @@ -343,7 +343,7 @@ PrimitivusDialog.__init__(self, _xmlui_parent) xmlui.MessageDialog.__init__(self, _xmlui_parent) sat_widgets.Alert.__init__( - self, title, message, ok_cb=lambda dummy: self._xmluiClose() + self, title, message, ok_cb=lambda __: self._xmluiClose() ) @@ -362,8 +362,8 @@ self, title, message, - no_cb=lambda dummy: self._xmluiCancelled(), - yes_cb=lambda dummy: self._xmluiValidated(), + no_cb=lambda __: self._xmluiCancelled(), + yes_cb=lambda __: self._xmluiValidated(), ) @@ -380,7 +380,7 @@ files_management.FileDialog.__init__( self, ok_cb=lambda path: self._xmluiValidated({"path": path}), - cancel_cb=lambda dummy: self._xmluiCancelled(), + cancel_cb=lambda __: self._xmluiCancelled(), message=message, title=title, style=style, @@ -458,7 +458,7 @@ buttons.append(urwid.Button(_("Cancel"), self.onFormCancelled)) else: buttons.append( - urwid.Button(_("OK"), on_press=lambda dummy: self._xmluiClose()) + urwid.Button(_("OK"), on_press=lambda __: self._xmluiClose()) ) max_len = max([len(button.get_label()) for button in buttons]) grid_wid = urwid.GridFlow(buttons, max_len + 4, 1, 0, "center") diff -r 92af49cde255 -r 378188abe941 sat_frontends/quick_frontend/quick_app.py --- a/sat_frontends/quick_frontend/quick_app.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/quick_frontend/quick_app.py Fri Jan 11 11:13:15 2019 +0100 @@ -123,7 +123,7 @@ autoconnect = C.bool(value_str) if autoconnect and not self.connected: self.host.connect( - self.profile, callback=lambda dummy: self._plug_profile_afterconnect() + self.profile, callback=lambda __: self._plug_profile_afterconnect() ) else: self._plug_profile_afterconnect() @@ -557,7 +557,7 @@ def connect(self, profile, callback=None, errback=None): if not callback: - callback = lambda dummy: None + callback = lambda __: None if not errback: def errback(failure): @@ -727,7 +727,7 @@ extra = {} if callback is None: callback = ( - lambda dummy=None: None + lambda __=None: None ) # FIXME: optional argument is here because pyjamas doesn't support callback # without arg with json proxy if errback is None: diff -r 92af49cde255 -r 378188abe941 sat_frontends/quick_frontend/quick_profile_manager.py --- a/sat_frontends/quick_frontend/quick_profile_manager.py Fri Jan 11 10:18:02 2019 +0100 +++ b/sat_frontends/quick_frontend/quick_profile_manager.py Fri Jan 11 11:13:15 2019 +0100 @@ -129,7 +129,7 @@ profile_key, callback=getProfileNameCb, errback=getProfileNameEb ) - def getParamError(self, dummy): + def getParamError(self, __): self.host.showDialog(_(u"Error"), _("Can't get profile parameter"), "error") ## Helping methods ##