Commit 6305fc69 authored by Philipp Hörist's avatar Philipp Hörist Committed by Philipp Hörist
Browse files

Fix logging-not-lazy pylint errors

parent 7674450c
......@@ -1094,7 +1094,7 @@ def _connect_failure(self, con_type=None):
conn=self, title=pritxt, msg=sectxt))
def on_proxy_failure(self, reason):
log.error('Connection to proxy failed: %s' % reason)
log.error('Connection to proxy failed: %s', reason)
self.time_to_reconnect = None
self.on_connect_failure = None
self.disconnect(on_purpose = True)
......@@ -1108,8 +1108,8 @@ def _connect_success(self, con, con_type):
log.info('Connect successfull')
_con_type = con_type
if _con_type != self._current_type:
log.info('Connecting to next host beacuse desired type is %s and returned is %s'
% (self._current_type, _con_type))
log.info('Connecting to next host beacuse desired type '
'is %s and returned is %s', self._current_type, _con_type)
self._connect_to_next_host()
return
con.RegisterDisconnectHandler(self._on_disconnected)
......@@ -1149,8 +1149,9 @@ def connection_accepted(self, con, con_type):
self.on_connect_failure = None
con.UnregisterDisconnectHandler(self._on_disconnected)
con.RegisterDisconnectHandler(self.disconnectedReconnCB)
log.debug('Connected to server %s:%s with %s' % (
self._current_host['host'], self._current_host['port'], con_type))
log.debug('Connected to server %s:%s with %s',
self._current_host['host'], self._current_host['port'],
con_type)
self.connection = con
......@@ -1222,7 +1223,7 @@ def _get_posh_file(self, hostname=None, redirect=None):
file = urlopen(
url, cafile=cafile, timeout=2)
except (URLError, ssl.CertificateError) as exc:
log.info('Error while requesting POSH: %s' % exc)
log.info('Error while requesting POSH: %s', exc)
return
if file.getcode() != 200:
......@@ -1274,7 +1275,7 @@ def ssl_certificate_accepted(self):
'accounts', self.name, 'authentication_mechanisms').split()
for mech in auth_mechs:
if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']):
log.warning("Unknown authentication mechanisms %s" % mech)
log.warning('Unknown authentication mechanisms %s', mech)
if not auth_mechs:
auth_mechs = None
else:
......@@ -1332,7 +1333,7 @@ def __on_auth(self, con, auth):
if not app.config.get_per('accounts', self.name, 'savepass'):
# Forget password, it's wrong
self.password = None
log.debug("Couldn't authenticate to %s" % self._hostname)
log.debug("Couldn't authenticate to %s", self._hostname)
self.disconnect(on_purpose = True)
app.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='offline'))
......
......@@ -505,8 +505,8 @@ def _nec_agent_removed(self, obj):
if obj.conn.name != self.name:
return
for jid in obj.jid_list:
log.debug('Removing contact %s due to unregistered transport %s' % \
(jid, obj.agent))
log.debug('Removing contact %s due to unregistered transport %s',
jid, obj.agent)
self.get_module('Presence').unsubscribe(jid)
# Transport contacts can't have 2 resources
if jid in app.to_be_removed[self.name]:
......
......@@ -96,7 +96,7 @@ def _generate_timestamp(self, tag):
tim = helpers.datetime_tuple(tag)
self.timestamp = timegm(tim)
except Exception:
log.error('wrong timestamp, ignoring it: ' + tag)
log.error('wrong timestamp, ignoring it: %s', tag)
self.timestamp = time_time()
def get_chatstate(self):
......@@ -253,7 +253,7 @@ def generate(self):
try:
self.get_jid_resource()
except Exception:
log.warning('Invalid JID: %s, ignoring it' % self.stanza.getFrom())
log.warning('Invalid JID: %s, ignoring it', self.stanza.getFrom())
return
jid_list = app.contacts.get_jid_list(self.conn.name)
self.timestamp = None
......
......@@ -77,12 +77,13 @@ def remove_event_handler(self, event_name, priority, handler):
try:
self.handlers[event_name].remove((priority, handler))
except ValueError as error:
log.warning('''Function (%s) with priority "%s" never registered
as handler of event "%s". Couldn\'t remove. Error: %s'''
%(handler, priority, event_name, error))
log.warning(
'''Function (%s) with priority "%s" never
registered as handler of event "%s". Couldn\'t remove.
Error: %s''', handler, priority, event_name, error)
def raise_event(self, event_name, *args, **kwargs):
log.debug('%s Args: %s'%(event_name, str(args)))
log.debug('%s Args: %s', event_name, str(args))
if event_name in self.handlers:
node_processed = False
for priority, handler in self.handlers[event_name]:
......
......@@ -1355,7 +1355,7 @@ def _get_img_direct(attrs):
req.add_header('User-Agent', 'Gajim ' + app.version)
f = urllib.request.urlopen(req)
except Exception as ex:
log.debug('Error loading image %s ' % attrs['src'] + str(ex))
log.debug('Error loading image %s ', attrs['src'] + str(ex))
pixbuf = None
alt = attrs.get('alt', 'Broken image')
else:
......@@ -1368,7 +1368,7 @@ def _get_img_direct(attrs):
deadline = time.time() + (10 * (max_size / 1048576))
while True:
if time.time() > deadline:
log.debug('Timeout loading image %s ' % attrs['src'])
log.debug('Timeout loading image %s ', attrs['src'])
mem = ''
alt = attrs.get('alt', '')
if alt:
......@@ -1378,7 +1378,7 @@ def _get_img_direct(attrs):
try:
temp = f.read(100)
except socket.timeout as ex:
log.debug('Timeout loading image %s ' % attrs['src'] + str(ex))
log.debug('Timeout loading image %s ', attrs['src'] + str(ex))
alt = attrs.get('alt', '')
if alt:
alt += '\n'
......@@ -1445,7 +1445,7 @@ def _get_img_proxy(attrs, proxy):
else:
alt += _('Error loading image')
except Exception as ex:
log.debug('Error loading image %s ' % attrs['src'] + str(ex))
log.debug('Error loading image %s ', attrs['src'] + str(ex))
pixbuf = None
alt = attrs.get('alt', 'Broken image')
return ('', alt)
......
......@@ -350,7 +350,7 @@ def on_connect(self, streamhost):
self.__send_candidate(args)
def _on_connect_error(self, sid):
log.info('connect error, sid=' + sid)
log.info('connect error, sid=%s', sid)
args = {'candError' : True,
'sendCand' : True}
self.__send_candidate(args)
......
......@@ -329,7 +329,7 @@ def get_content(self):
return content
def _on_proxy_auth_ok(self, proxy):
log.info('proxy auth ok for ' + str(proxy))
log.info('proxy auth ok for %s', str(proxy))
# send activate request to proxy, send activated confirmation to peer
if not self.connection:
return
......
......@@ -34,7 +34,7 @@ class AbstractPEP:
def get_tag_as_PEP(cls, jid, account, event_tag):
items = event_tag.getTag('items', {'node': cls.namespace})
if items:
log.debug("Received PEP 'user %s' from %s" % (cls.type_, jid))
log.debug('Received PEP "user %s" from %s', cls.type_, jid)
return cls(jid, account, items)
else:
return None
......
......@@ -778,7 +778,7 @@ def IBBIqHandler(self, conn, stanza):
Handles streams state change. Used internally.
"""
typ = stanza.getType()
log.debug('IBBIqHandler called typ->%s' % typ)
log.debug('IBBIqHandler called typ->%s', typ)
if typ == 'set' and stanza.getTag('open'):
self.StreamOpenHandler(conn, stanza)
elif typ == 'set' and stanza.getTag('close'):
......@@ -808,8 +808,8 @@ def StreamOpenHandler(self, conn, stanza):
err = None
sid = stanza.getTagAttr('open', 'sid')
blocksize = stanza.getTagAttr('open', 'block-size')
log.debug('StreamOpenHandler called sid->%s blocksize->%s' % (sid,
blocksize))
log.debug('StreamOpenHandler called sid->%s blocksize->%s',
sid, blocksize)
file_props = FilesProp.getFilePropByTransportSid(self.name, sid)
try:
blocksize = int(blocksize)
......@@ -822,7 +822,8 @@ def StreamOpenHandler(self, conn, stanza):
if err:
rep = nbxmpp.Error(stanza, err)
else:
log.debug("Opening stream: id %s, block-size %s" % (sid, blocksize))
log.debug("Opening stream: id %s, block-size %s",
sid, blocksize)
rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result',
stanza.getTo(), {'id': stanza.getID()})
file_props.block_size = blocksize
......@@ -934,7 +935,7 @@ def IBBMessageHandler(self, conn, stanza):
sid = stanza.getTagAttr('data', 'sid')
seq = stanza.getTagAttr('data', 'seq')
data = stanza.getTagData('data')
log.debug('ReceiveHandler called sid->%s seq->%s' % (sid, seq))
log.debug('ReceiveHandler called sid->%s seq->%s', sid, seq)
try:
seq = int(seq)
data = base64.b64decode(data.encode('utf-8'))
......@@ -951,8 +952,8 @@ def IBBMessageHandler(self, conn, stanza):
elif seq != file_props.seq:
err = nbxmpp.ERR_UNEXPECTED_REQUEST
else:
log.debug('Successfully received sid->%s %s+%s bytes' % (sid,
file_props.fp.tell(), len(data)))
log.debug('Successfully received sid->%s %s+%s bytes',
sid, file_props.fp.tell(), len(data))
file_props.seq += 1
file_props.started = True
file_props.fp.write(data)
......@@ -964,7 +965,7 @@ def IBBMessageHandler(self, conn, stanza):
if file_props.received_len >= file_props.size:
file_props.completed = True
if err:
log.debug('Error on receive: %s' % err)
log.debug('Error on receive: %s', err)
conn.send(nbxmpp.Error(nbxmpp.Iq(to=stanza.getFrom(),
frm=stanza.getTo(),
payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close')]), err, reply=0))
......@@ -977,7 +978,7 @@ def StreamCloseHandler(self, conn, stanza):
Raise xmpppy event specifying successful data receive.
"""
sid = stanza.getTagAttr('close', 'sid')
log.debug('StreamCloseHandler called sid->%s' % sid)
log.debug('StreamCloseHandler called sid->%s', sid)
# look in sending files
file_props = FilesProp.getFilePropByTransportSid(self.name, sid)
if file_props:
......@@ -1002,7 +1003,7 @@ def IBBAllIqHandler(self, conn, stanza):
is agreed upon.
"""
syn_id = stanza.getID()
log.debug('IBBAllIqHandler called syn_id->%s' % syn_id)
log.debug('IBBAllIqHandler called syn_id->%s', syn_id)
for file_props in FilesProp.getAllFileProp():
if not file_props.direction or not file_props.connected:
# It's socks5 bytestream
......
......@@ -122,22 +122,22 @@ def resolve_result(self, host, port, jid):
self.state = S_FINISHED
return
self.state = S_INITIAL
log.info('start resolving %s:%s' % (self.host, self.port))
log.info('start resolving %s:%s', self.host, self.port)
self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
self.sid, self.sender_jid, self._on_receiver_success,
self._on_connect_failure)
self.receiver_tester.connect()
def _on_receiver_success(self):
log.debug('Receiver successfully connected %s:%s' % (self.host,
self.port))
log.debug('Receiver successfully connected %s:%s',
self.host, self.port)
self.host_tester = HostTester(self.host, self.port, self.jid,
self.sid, self.sender_jid, self._on_connect_success,
self._on_connect_failure)
self.host_tester.connect()
def _on_connect_success(self):
log.debug('Host successfully connected %s:%s' % (self.host, self.port))
log.debug('Host successfully connected %s:%s', self.host, self.port)
iq = nbxmpp.Protocol(name='iq', to=self.jid, typ='set')
query = iq.setTag('query')
query.setNamespace(nbxmpp.NS_BYTESTREAM)
......@@ -147,7 +147,7 @@ def _on_connect_success(self):
activate.setData('test@gajim.org/test2')
if self.active_connection:
log.debug('Activating bytestream on %s:%s' % (self.host, self.port))
log.debug('Activating bytestream on %s:%s', self.host, self.port)
self.active_connection.SendAndCallForResponse(iq,
self._result_received)
self.state = S_ACTIVATED
......@@ -162,11 +162,11 @@ def _result_received(self, data):
self._on_connect_failure()
def keep_conf(self):
log.debug('Bytestream activated %s:%s' % (self.host, self.port))
log.debug('Bytestream activated %s:%s', self.host, self.port)
self.state = S_FINISHED
def _on_connect_failure(self):
log.debug('Connection failed with %s:%s' % (self.host, self.port))
log.debug('Connection failed with %s:%s', self.host, self.port)
self.state = S_FINISHED
self.host = None
self.port = 0
......@@ -318,9 +318,9 @@ def pollin(self):
data = self._get_request_buff(self._get_sha1_auth())
self.send_raw(data)
self.state += 1
log.debug('Host authenticating to %s:%s' % (self.host, self.port))
log.debug('Host authenticating to %s:%s', self.host, self.port)
elif self.state == 3:
log.debug('Host authenticated to %s:%s' % (self.host, self.port))
log.debug('Host authenticated to %s:%s', self.host, self.port)
self.on_success()
self.disconnect()
self.state += 1
......@@ -331,7 +331,7 @@ def do_connect(self):
try:
self._sock.connect((self.host, self.port))
self._sock.setblocking(False)
log.debug('Host Connecting to %s:%s' % (self.host, self.port))
log.debug('Host Connecting to %s:%s', self.host, self.port)
self._send = self._sock.send
self._recv = self._sock.recv
except Exception as ee:
......@@ -351,7 +351,7 @@ def do_connect(self):
self._recv = self._sock.recv
self.buff = b''
self.state = 1 # connected
log.debug('Host connected to %s:%s' % (self.host, self.port))
log.debug('Host connected to %s:%s', self.host, self.port)
self.idlequeue.plug_idle(self, True, False)
return
......@@ -436,7 +436,7 @@ def pollin(self):
if version != 0x05 or method == 0xff:
self.pollend()
return
log.debug('Receiver authenticating to %s:%s' % (self.host, self.port))
log.debug('Receiver authenticating to %s:%s', self.host, self.port)
data = self._get_request_buff(self._get_sha1_auth())
self.send_raw(data)
self.state += 1
......@@ -448,7 +448,7 @@ def pollin(self):
if version != 0x05 or reply != 0x00:
self.pollend()
return
log.debug('Receiver authenticated to %s:%s' % (self.host, self.port))
log.debug('Receiver authenticated to %s:%s', self.host, self.port)
self.on_success()
self.disconnect()
self.state += 1
......@@ -459,7 +459,7 @@ def do_connect(self):
try:
self._sock.setblocking(False)
self._sock.connect((self.host, self.port))
log.debug('Receiver Connecting to %s:%s' % (self.host, self.port))
log.debug('Receiver Connecting to %s:%s', self.host, self.port)
self._send = self._sock.send
self._recv = self._sock.recv
except Exception as ee:
......@@ -479,5 +479,5 @@ def do_connect(self):
self._recv = self._sock.recv
self.buff = ''
self.state = 1 # connected
log.debug('Receiver connected to %s:%s' % (self.host, self.port))
log.debug('Receiver connected to %s:%s', self.host, self.port)
self.idlequeue.plug_idle(self, True, False)
......@@ -132,22 +132,22 @@ def connect_to_hosts(self, account, transport_sid, on_success=None,
fp = fingerprint
if receiving:
if 'candidate_id' in streamhost:
log.debug('Trying to connect as receiver to cid ' + \
streamhost['candidate_id'])
log.debug('Trying to connect as receiver to cid %s',
streamhost['candidate_id'])
else:
log.debug('Trying to connect as receiver to jid ' + \
streamhost['jid'])
log.debug('Trying to connect as receiver to jid %s',
streamhost['jid'])
file_props.type_ = 'r'
socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost,
transport_sid, file_props, fingerprint=fp)
self.add_sockobj(account, socks5obj)
else:
if 'candidate_id' in streamhost:
log.debug('Trying to connect as sender to cid ' + \
streamhost['candidate_id'])
log.debug('Trying to connect as sender to cid %s',
streamhost['candidate_id'])
else:
log.debug('Trying to connect as sender to jid ' + \
streamhost['jid'])
log.debug('Trying to connect as sender to jid %s',
streamhost['jid'])
if file_props.sha_str:
idx = file_props.sha_str
else:
......@@ -175,9 +175,9 @@ def _socket_connected(self, streamhost, file_props):
streamhosts. Stop other attempts for connections
"""
if 'candidate_id' in streamhost:
log.debug('Connected to cid ' + streamhost['candidate_id'])
log.debug('Connected to cid %s', streamhost['candidate_id'])
else:
log.debug('Connected to jid ' + streamhost['jid'])
log.debug('Connected to jid %s', streamhost['jid'])
for host in file_props.streamhosts:
if host != streamhost and 'idx' in host:
if host['state'] == 1:
......@@ -240,9 +240,10 @@ def _connection_refused(self, streamhost, file_props, idx):
Called when we loose connection during transfer
"""
if 'candidate_id' in streamhost:
log.debug('Connection refused to cid ' + streamhost['candidate_id'])
log.debug('Connection refused to cid %s',
streamhost['candidate_id'])
else:
log.debug('Connection refused to jid ' + streamhost['jid'])
log.debug('Connection refused to jid %s', streamhost['jid'])
if file_props is None:
return
streamhost['state'] = -1
......@@ -641,7 +642,7 @@ def receive(self):
add = self._recv(64)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request : ' + repr(e))
log.info('SSL rehandshake request: %s', repr(e))
raise e
except Exception:
add = b''
......@@ -658,7 +659,7 @@ def send_raw(self, raw_data):
self._send(raw_data)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request :' + repr(e))
log.info('SSL rehandshake request: %s', repr(e))
raise e
except Exception:
self.disconnect()
......@@ -682,7 +683,7 @@ def write_next(self):
lenn = self._send(buff)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request :' + repr(e))
log.info('SSL rehandshake request: %s', repr(e))
raise e
except Exception as e:
if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK):
......@@ -756,7 +757,7 @@ def get_file_contents(self, timeout):
buff = self._recv(MAX_BUFF_LEN)
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e:
log.info('SSL rehandshake request :' + repr(e))
log.info('SSL rehandshake request: %s', repr(e))
raise e
except Exception:
buff = b''
......@@ -896,7 +897,7 @@ def read_connect(self):
buff = self._recv().decode('utf-8')
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError,
OpenSSL.SSL.WantX509LookupError) as e:
log.info("SSL rehandshake request : " + repr(e))
log.info("SSL rehandshake request: %s", repr(e))
raise e
try:
version, method = struct.unpack('!BB', buff)
......@@ -1269,8 +1270,9 @@ def main(self, timeout=0):
def send_file(self):
if self.ssl_errnum > 0:
log.error('remote certificate does not match the announced one.' + \
'\nSSL Error: %d\nCancelling file transfer' % self.ssl_errnum)
log.error('remote certificate does not match the announced one.'
'\nSSL Error: %d\nCancelling file transfer',
self.ssl_errnum)
self.file_props.error = -12
return -1
return super(Socks5Client, self).send_file()
......@@ -1435,7 +1437,7 @@ def bind(self):
self.ai = None
continue
if not self.ai:
log.error('unable to bind to port ' + str(self.port))
log.error('unable to bind to port %s', str(self.port))
return None
self._serv.listen(socket.SOMAXCONN)
self._serv.setblocking(False)
......
......@@ -114,7 +114,7 @@ def disconnect(self, message=''):
"""
Free all resources, we are not listening anymore
"""
log.info('Disconnecting ZeroconfListener: %s' % message)
log.info('Disconnecting ZeroconfListener: %s', message)
app.idlequeue.remove_timeout(self.fd)
app.idlequeue.unplug_idle(self.fd)
self.fd = -1
......@@ -252,8 +252,8 @@ def send_stream_header(self):
def _check_stream_start(self, ns, tag, attrs):
if ns != NS_STREAMS or tag != 'stream':
log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag,
ns), 'error')
log.error('Incorrect stream start: (%s,%s).Terminating!',
tag, ns)
self.Connection.disconnect()
if self.on_not_ok:
self.on_not_ok('Connection to host could not be established: '
......@@ -386,8 +386,8 @@ def connect_to_next_ip(self):
self.disconnect()
return
ai = self.ais.pop(0)
log.info('Trying to connect to %s through %s:%s', str(self.host),
ai[4][0], ai[4][1], exc_info=True)
log.info('Trying to connect to %s through %s:%s',
str(self.host), ai[4][0], ai[4][1], exc_info=True)
try:
self._sock = socket.socket(*ai[:3])
self._sock.setblocking(False)
......@@ -543,7 +543,7 @@ def pollin(self):
self.on_receive(received)
else:
# This should never happed, so we need the debug
log.error('Unhandled data received: %s' % received)
log.error('Unhandled data received: %s', received)
self.disconnect()
return True
......@@ -608,7 +608,7 @@ def _plug_idle(self):
def _on_send(self):
if self.sent_data and self.sent_data.strip():
log.debug('sent: %s' % self.sent_data)
log.debug('sent: %s', self.sent_data)
if hasattr(self._owner, 'Dispatcher'):
self._owner.Dispatcher.Event(
'', DATA_SENT, self.sent_data.decode('utf-8'))
......@@ -705,7 +705,7 @@ def disconnect(self):
self.roster = None
self.disconnecting = True
for i in reversed(self.disconnect_handlers):
log.debug('Calling disconnect handler %s' % i)
log.debug('Calling disconnect handler %s', i)
i()
self.disconnecting = False
......
......@@ -60,7 +60,7 @@ def entrygroup_commit_error_CB(self, err):
pass
def error_callback1(self, err):
log.debug('Error while resolving: ' + str(err))
log.debug('Error while resolving: %s', str(err))
def error_callback(self, err):
log.debug(str(err))
......@@ -71,8 +71,8 @@ def error_callback(self, err):
def new_service_callback(self, interface, protocol, name, stype, domain,
flags):
log.debug('Found service %s in domain %s on %i.%i.' % (name, domain,
interface, protocol))
log.debug('Found service %s in domain %s on %i.%i.',
name, domain, interface, protocol)
if not self.connected:
return
......@@ -84,8 +84,8 @@ def new_service_callback(self, interface, protocol, name, stype, domain,
def remove_service_callback(self, interface, protocol, name, stype, domain,
flags):
log.debug('Service %s in domain %s on %i.%i disappeared.' % (name,
domain, interface, protocol))
log.debug('Service %s in domain %s on %i.%i disappeared.',
name, domain, interface, protocol)
if not self.connected:
return
if name != self.name:
......@@ -161,10 +161,10 @@ def dict_to_txt_array(self, txt_dict):
def service_resolved_callback(self, interface, protocol, name, stype, domain,
host, aprotocol, address, port, txt, flags):
log.debug('Service data for service %s in domain %s on %i.%i:'
% (name, domain, interface, protocol))
log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address,
port, self.txt_array_to_dict(txt)))
log.debug('Service data for service %s in domain %s on %i.%i:',
name, domain, interface, protocol)
log.debug('Host %s (%s), port %i, TXT data: %s',
host, address, port, self.txt_array_to_dict(txt))
if not self.connected:
return
bare_name = name
......@@ -186,11 +186,13 @@ def service_resolved_callback(self, interface, protocol, name, stype, domain,
# IPv6 aprotocol responses via the same protocol,
# so this probably needs to be revised again.
if old_resolved_info[i][0:2] == (interface, protocol):
log.debug('Deleting resolved info for interface %i, protocol %i, host %s, aprotocol %i, address %s, port %i' % old_resolved_info[i])
log.debug('Deleting resolved info for interface %s',
old_resolved_info[i])
del old_resolved_info[i]
break
resolved_info = resolved_info + old_resolved_info
log.debug('Collected resolved info is now: %s' % (resolved_info,))
log.debug('Collected resolved info is now: %s',