rabbit/qpid: remove the args/kwargs from ensure()
Having an *args list following the retry kwargs just screams: SyntaxError: non-keyword arg after keyword arg but we don't actually pass any args to methods invoked via ensure() so these are just unused and can be removed. If we did want them in future we could just use functools.partial(). Change-Id: Idef12bbc94d39c84ee06ddd6d743f3d2f705a8d1
This commit is contained in:
parent
948c05417c
commit
d7b85a1492
|
@ -573,10 +573,10 @@ class Connection(object):
|
|||
|
||||
LOG.debug("Re-established AMQP queues")
|
||||
|
||||
def ensure(self, error_callback, method, retry=None, *args, **kwargs):
|
||||
def ensure(self, error_callback, method, retry=None):
|
||||
while True:
|
||||
try:
|
||||
return method(*args, **kwargs)
|
||||
return method()
|
||||
except (qpid_exceptions.Empty,
|
||||
qpid_exceptions.MessagingError) as e:
|
||||
if error_callback:
|
||||
|
|
|
@ -645,10 +645,10 @@ class Connection(object):
|
|||
'%(sleep_time)d seconds.') % log_info)
|
||||
time.sleep(sleep_time)
|
||||
|
||||
def ensure(self, error_callback, method, retry=None, *args, **kwargs):
|
||||
def ensure(self, error_callback, method, retry=None):
|
||||
while True:
|
||||
try:
|
||||
return method(*args, **kwargs)
|
||||
return method()
|
||||
except self.connection_errors as e:
|
||||
if error_callback:
|
||||
error_callback(e)
|
||||
|
|
Loading…
Reference in New Issue