copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use log.warning instead of the deprecated log.warn.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2013-01-05 11:26:22 +01:00
parent ec6e9667fa
commit ab7ce2b42e
10 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/check_X509.py
View file

@ -173,7 +173,7 @@ try:
return True return True
return False return False
except ImportError: except ImportError:
log.warn('Import of PyOpenSSL or pyasn1 failed. Cannot correctly check ' log.warning('Import of PyOpenSSL or pyasn1 failed. Cannot correctly check '
'SSL certificate') 'SSL certificate')
def check_certificate(cert, domain): def check_certificate(cert, domain):

2
src/common/commands.py
View file

@ -381,7 +381,7 @@ class ConnectionCommands:
try: try:
jid = helpers.get_full_jid_from_iq(iq_obj) jid = helpers.get_full_jid_from_iq(iq_obj)
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % iq_obj.getFrom()) log.warning('Invalid JID: %s, ignoring it' % iq_obj.getFrom())
return return
node = iq_obj.getTagAttr('query', 'node') node = iq_obj.getTagAttr('query', 'node')

2
src/common/connection.py
View file

@ -2678,7 +2678,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return return
if self.awaiting_xmpp_ping_id: if self.awaiting_xmpp_ping_id:
# We haven't got the pong in time, disco and reconnect # We haven't got the pong in time, disco and reconnect
log.warn("No reply received for keepalive ping. Reconnecting.") log.warning("No reply received for keepalive ping. Reconnecting.")
self._disconnectedReconnCB() self._disconnectedReconnCB()
def _reconnect_alarm(self): def _reconnect_alarm(self):

20
src/common/connection_handlers_events.py
View file

@ -306,7 +306,7 @@ class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent):
try: try:
jid = helpers.parse_jid(item.getAttr('jid')) jid = helpers.parse_jid(item.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) log.warning('Invalid JID: %s, ignoring it' % item.getAttr('jid'))
continue continue
name = item.getAttr('name') name = item.getAttr('name')
contact = gajim.contacts.get_contact(self.conn.name, jid) contact = gajim.contacts.get_contact(self.conn.name, jid)
@ -399,7 +399,7 @@ class RosterSetReceivedEvent(nec.NetworkIncomingEvent):
try: try:
jid = helpers.parse_jid(item.getAttr('jid')) jid = helpers.parse_jid(item.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) log.warning('Invalid JID: %s, ignoring it' % item.getAttr('jid'))
continue continue
name = item.getAttr('name') name = item.getAttr('name')
sub = item.getAttr('subscription') sub = item.getAttr('subscription')
@ -447,7 +447,7 @@ class MucAdminReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
try: try:
jid = helpers.parse_jid(item.getAttr('jid')) jid = helpers.parse_jid(item.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % \ log.warning('Invalid JID: %s, ignoring it' % \
item.getAttr('jid')) item.getAttr('jid'))
continue continue
affiliation = item.getAttr('affiliation') affiliation = item.getAttr('affiliation')
@ -489,7 +489,7 @@ class BookmarksHelper:
try: try:
jid = helpers.parse_jid(conf.getAttr('jid')) jid = helpers.parse_jid(conf.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) log.warning('Invalid JID: %s, ignoring it' % conf.getAttr('jid'))
continue continue
bm = {'name': conf.getAttr('name'), bm = {'name': conf.getAttr('name'),
'jid': jid, 'jid': jid,
@ -541,7 +541,7 @@ class PrivateStorageRosternotesReceivedEvent(nec.NetworkIncomingEvent):
try: try:
jid = helpers.parse_jid(note.getAttr('jid')) jid = helpers.parse_jid(note.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % note.getAttr('jid')) log.warning('Invalid JID: %s, ignoring it' % note.getAttr('jid'))
continue continue
annotation = note.getData() annotation = note.getData()
self.annotations[jid] = annotation self.annotations[jid] = annotation
@ -755,7 +755,7 @@ PresenceHelperEvent):
try: try:
self.get_jid_resource() self.get_jid_resource()
except Exception: except Exception:
log.warn('Invalid JID: %s, ignoring it' % self.stanza.getFrom()) log.warning('Invalid JID: %s, ignoring it' % self.stanza.getFrom())
return return
jid_list = gajim.contacts.get_jid_list(self.conn.name) jid_list = gajim.contacts.get_jid_list(self.conn.name)
self.timestamp = None self.timestamp = None
@ -1036,7 +1036,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
try: try:
self.fjid = helpers.parse_jid(address.getAttr('jid')) self.fjid = helpers.parse_jid(address.getAttr('jid'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % address.getAttr( log.warning('Invalid JID: %s, ignoring it' % address.getAttr(
'jid')) 'jid'))
return return
self.jid = gajim.get_jid_without_resource(self.fjid) self.jid = gajim.get_jid_without_resource(self.fjid)
@ -1186,7 +1186,7 @@ class GcInvitationReceivedEvent(nec.NetworkIncomingEvent):
try: try:
self.jid_from = helpers.parse_jid(item.getAttr('from')) self.jid_from = helpers.parse_jid(item.getAttr('from'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) log.warning('Invalid JID: %s, ignoring it' % item.getAttr('from'))
return return
jid = gajim.get_jid_without_resource(self.jid_from) jid = gajim.get_jid_without_resource(self.jid_from)
if gajim.config.get_per('accounts', self.conn.name, if gajim.config.get_per('accounts', self.conn.name,
@ -1213,7 +1213,7 @@ class GcDeclineReceivedEvent(nec.NetworkIncomingEvent):
try: try:
self.jid_from = helpers.parse_jid(item.getAttr('from')) self.jid_from = helpers.parse_jid(item.getAttr('from'))
except helpers.InvalidFormat: except helpers.InvalidFormat:
log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) log.warning('Invalid JID: %s, ignoring it' % item.getAttr('from'))
return return
jid = gajim.get_jid_without_resource(self.jid_from) jid = gajim.get_jid_without_resource(self.jid_from)
if gajim.config.get_per('accounts', self.conn.name, if gajim.config.get_per('accounts', self.conn.name,
@ -1919,7 +1919,7 @@ class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
def generate(self): def generate(self):
self.get_id() self.get_id()
if self.id_ is None: if self.id_ is None:
log.warn('Invalid IQ received without an ID. Ignoring it: %s' % \ log.warning('Invalid IQ received without an ID. Ignoring it: %s' % \
self.stanza) self.stanza)
return return
# According to XEP-0030: # According to XEP-0030:

2
src/common/ged.py
View file

@ -80,7 +80,7 @@ class GlobalEventsDispatcher(object):
try: try:
self.handlers[event_name].remove((priority, handler)) self.handlers[event_name].remove((priority, handler))
except ValueError: except ValueError:
log.warn('''Function (%s) with priority "%s" never registered log.warning('''Function (%s) with priority "%s" never registered
as handler of event "%s". Couldn\'t remove. Error: %s''' as handler of event "%s". Couldn\'t remove. Error: %s'''
%(handler, priority, event_name, error)) %(handler, priority, event_name, error))

2
src/common/jingle_rtp.py
View file

@ -88,7 +88,7 @@ class JingleRTPContent(JingleContent):
ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC, ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC,
socket.SOCK_STREAM)[0][4][0] socket.SOCK_STREAM)[0][4][0]
except socket.gaierror as e: except socket.gaierror as e:
log.warn('Lookup of stun ip failed: %s' % str(e)) log.warning('Lookup of stun ip failed: %s' % str(e))
else: else:
params['stun-ip'] = ip params['stun-ip'] = ip

4
src/common/logging_helpers.py
View file

@ -177,13 +177,13 @@ if __name__ == '__main__':
log = logging.getLogger('gajim') log = logging.getLogger('gajim')
log.debug('debug') log.debug('debug')
log.info('info') log.info('info')
log.warn('warn') log.warning('warn')
log.error('error') log.error('error')
log.critical('critical') log.critical('critical')
log = logging.getLogger('gajim.c.x.dispatcher') log = logging.getLogger('gajim.c.x.dispatcher')
log.debug('debug') log.debug('debug')
log.info('info') log.info('info')
log.warn('warn') log.warning('warn')
log.error('error') log.error('error')
log.critical('critical') log.critical('critical')

2
src/common/protocol/bytestream.py
View file

@ -645,7 +645,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
self.send_success_connect_reply, None) self.send_success_connect_reply, None)
raise nbxmpp.NodeProcessed raise nbxmpp.NodeProcessed
else: else:
log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') log.warning('Gajim got streamhosts for unknown transfer. Ignoring it.')
raise nbxmpp.NodeProcessed raise nbxmpp.NodeProcessed
file_props.streamhosts = streamhosts file_props.streamhosts = streamhosts

2
src/gui_interface.py
View file

@ -449,7 +449,7 @@ class Interface:
if not obj.session: if not obj.session:
# No session. This can happen when sending a message from # No session. This can happen when sending a message from
# gajim-remote # gajim-remote
log.warn(msg) log.warning(msg)
return return
obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name,
msg_type='error') msg_type='error')

2
src/plugins/plugin.py
View file

@ -264,7 +264,7 @@ class GajimPluginConfig():
s.close() s.close()
self.save() self.save()
except: except:
log.warn('%s plugin config file not readable. Saving it as ' log.warning('%s plugin config file not readable. Saving it as '
'%s and creating a new one' % (self.plugin.short_name, '%s and creating a new one' % (self.plugin.short_name,
self.FILE_PATH + '.bak')) self.FILE_PATH + '.bak'))
if os.path.exists(self.FILE_PATH + '.bak'): if os.path.exists(self.FILE_PATH + '.bak'):