misc: replaced all "dummy" by the more conventional and readable "__" ("_" being used for gettext)

This commit is contained in:
Goffi 2019-01-11 11:13:15 +01:00
commit 7a9ee35cfc
13 changed files with 215 additions and 215 deletions

View file

@ -32,7 +32,7 @@ class BridgeException(Exception):
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 ""

View file

@ -119,7 +119,7 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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 @@ class Bridge(object):
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)

View file

@ -723,7 +723,7 @@ class Jp(object):
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 @@ class Jp(object):
# 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:

View file

@ -88,7 +88,7 @@ class AccountCreate(base.CommandBase):
errback=self.errback,
)
def _session_started(self, dummy):
def _session_started(self, __):
self.host.bridge.setParam(
"JabberID",
self.args.jid,

View file

@ -201,7 +201,7 @@ class Get(base.CommandBase):
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",

View file

@ -87,7 +87,7 @@ class ProfileDelete(base.CommandBase):
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 @@ class ProfileCreate(base.CommandBase):
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

View file

@ -90,7 +90,7 @@ class Purge(base.CommandBase):
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()

View file

@ -533,7 +533,7 @@ class XMLUIDialog(xmlui_base.XMLUIDialog):
dialog_factory = WidgetFactory()
read_only = False
def show(self, dummy=None):
def show(self, __=None):
self.dlg.show()
def _xmluiClose(self):

View file

@ -703,7 +703,7 @@ class Chat(PrimitivusWidget, quick_chat.QuickChat):
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)

View file

@ -124,7 +124,7 @@ class ProfileManager(QuickProfileManager, urwid.WidgetWrap):
self.host.bridge.profileStartSession(
"",
profile,
callback=lambda dummy: self.newProfileSessionStarted(profile),
callback=lambda __: self.newProfileSessionStarted(profile),
errback=self.profileCreationFailure,
)

View file

@ -343,7 +343,7 @@ class PrimitivusMessageDialog(PrimitivusDialog, xmlui.MessageDialog, sat_widgets
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 @@ class PrimitivusConfirmDialog(
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 @@ class PrimitivusFileDialog(
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 @@ class XMLUIPanel(xmlui.XMLUIPanel, PrimitivusWidget):
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")

View file

@ -123,7 +123,7 @@ class ProfileManager(object):
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 @@ class QuickApp(object):
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 @@ class QuickApp(object):
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:

View file

@ -129,7 +129,7 @@ class QuickProfileManager(object):
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 ##