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

coding standards 

self.node_to_dict always return a dict
This commit is contained in:
Yann Leboulanger 2005-11-01 14:43:00 +00:00
parent dc95dc33d2
commit ce247d053f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/connection.py
View File

@ -247,7 +247,7 @@ class Connection:
if vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD: if vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
card = vc.getChildren()[0] card = vc.getChildren()[0]
vcard = self.node_to_dict(card) vcard = self.node_to_dict(card)
if vcard and vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \ if vcard.has_key('PHOTO') and isinstance(vcard['PHOTO'], dict) and \
vcard['PHOTO'].has_key('BINVAL'): vcard['PHOTO'].has_key('BINVAL'):
photo = vcard['PHOTO']['BINVAL'] photo = vcard['PHOTO']['BINVAL']
avatar_sha = sha.sha(photo).hexdigest() avatar_sha = sha.sha(photo).hexdigest()
@ -898,7 +898,8 @@ class Connection:
return return
port = gajim.config.get('file_transfers_port') port = gajim.config.get('file_transfers_port')
ft_override_host_to_send = gajim.config.get('ft_override_host_to_send') ft_override_host_to_send = gajim.config.get('ft_override_host_to_send')
cfg_proxies = gajim.config.get_per('accounts', self.name, 'file_transfer_proxies') cfg_proxies = gajim.config.get_per('accounts', self.name,
'file_transfer_proxies')
if receiver is None: if receiver is None:
receiver = file_props['receiver'] receiver = file_props['receiver']
if sender is None: if sender is None:
@ -1021,7 +1022,8 @@ class Connection:
iq = common.xmpp.Protocol(name = 'iq', iq = common.xmpp.Protocol(name = 'iq',
to = unicode(file_props['sender']), typ = 'error') to = unicode(file_props['sender']), typ = 'error')
iq.setAttr('id', file_props['request-id']) iq.setAttr('id', file_props['request-id'])
err = common.xmpp.ErrorNode(code = '406', typ = 'auth', name = 'not-acceptable') err = common.xmpp.ErrorNode(code = '406', typ = 'auth', name =
'not-acceptable')
iq.addChild(node=err) iq.addChild(node=err)
self.to_be_sent.append(iq) self.to_be_sent.append(iq)
@ -1658,7 +1660,8 @@ class Connection:
keyID = gajim.config.get_per('accounts', self.name, 'keyid') keyID = gajim.config.get_per('accounts', self.name, 'keyid')
if keyID and USE_GPG: if keyID and USE_GPG:
use_gpg_agent = gajim.config.get('use_gpg_agent') use_gpg_agent = gajim.config.get('use_gpg_agent')
if self.connected < 2 and self.gpg.passphrase is None and not use_gpg_agent: if self.connected < 2 and self.gpg.passphrase is None and \
not use_gpg_agent:
# We didn't set a passphrase # We didn't set a passphrase
self.dispatch('ERROR', (_('OpenPGP passphrase was not given'), self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),
#%s is the account name here #%s is the account name here
@ -1679,7 +1682,8 @@ class Connection:
if sync: if sync:
self.change_status2(show, msg, auto) self.change_status2(show, msg, auto)
else: else:
t = threading.Thread(target=self.change_status2, args = (show, msg, auto)) t = threading.Thread(target=self.change_status2, args = (show, msg,
auto))
t.start() t.start()
def change_status2(self, show, msg, auto = False): def change_status2(self, show, msg, auto = False):
@ -1911,7 +1915,7 @@ class Connection:
c = f.read() c = f.read()
card = common.xmpp.Node(node = c) card = common.xmpp.Node(node = c)
vcard = self.node_to_dict(card) vcard = self.node_to_dict(card)
if vcard and vcard.has_key('PHOTO') and vcard['PHOTO'].has_key('SHA'): if vcard.has_key('PHOTO') and vcard['PHOTO'].has_key('SHA'):
cached_sha = vcard['PHOTO']['SHA'] cached_sha = vcard['PHOTO']['SHA']
if self.vcard_shas.has_key(jid) and self.vcard_shas[jid] != \ if self.vcard_shas.has_key(jid) and self.vcard_shas[jid] != \
cached_sha: cached_sha:
@ -2147,11 +2151,10 @@ class Connection:
def send_invite(self, room, to, reason=''): def send_invite(self, room, to, reason=''):
'''sends invitation''' '''sends invitation'''
message=common.xmpp.Message(to = room) message=common.xmpp.Message(to = room)
message.addChild(name = 'x',namespace = common.xmpp.NS_MUC_USER) c = message.addChild(name = 'x', namespace = common.xmpp.NS_MUC_USER)
message.getChildren()[0].addChild(name = 'invite', attrs={'to' : to}) c = c.addChild(name = 'invite', attrs={'to' : to})
if reason != '': if reason != '':
message.getChildren()[0].getChildren()[0].addChild(name = 'reason') c.setTagData('reason', reason)
message.getChildren()[0].getChildren()[0].getChildren()[0].addData(reason)
self.to_be_sent.append(message) self.to_be_sent.append(message)
def send_keepalive(self): def send_keepalive(self):