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

coding standards

Browse source
This commit is contained in:
Yann Leboulanger 2012-08-22 12:55:57 +02:00
parent 133593e1ca
commit f832900d2b
16 changed files with 96 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/adhoc_commands.py
View file

@ -371,7 +371,7 @@ class CommandWindow:
_('The form is not filled correctly.')) _('The form is not filled correctly.'))
self.data_form_widget.set_sensitive(True) self.data_form_widget.set_sensitive(True)
return return
self.data_form_widget.data_form.type = 'submit' self.data_form_widget.data_form.type_ = 'submit'
else: else:
self.data_form_widget.hide() self.data_form_widget.hide()

4
src/common/connection_handlers_events.py
View file

@ -1683,7 +1683,7 @@ class PEPReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
pep = pep_class.get_tag_as_PEP(self.fjid, self.conn.name, pep = pep_class.get_tag_as_PEP(self.fjid, self.conn.name,
self.event_tag) self.event_tag)
if pep: if pep:
self.pep_type = pep.type self.pep_type = pep.type_
return True return True
items = self.event_tag.getTag('items') items = self.event_tag.getTag('items')
@ -2007,7 +2007,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
return return
self.dataform = dataforms.ExtendForm(node=form_tag) self.dataform = dataforms.ExtendForm(node=form_tag)
for f in self.dataform.iter_fields(): for f in self.dataform.iter_fields():
if f.var == 'stream-method' and f.type == 'list-single': if f.var == 'stream-method' and f.type_ == 'list-single':
values = [o[1] for o in f.options] values = [o[1] for o in f.options]
self.file_props.stream_methods = ' '.join(values) self.file_props.stream_methods = ' '.join(values)
if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values:

8
src/common/dataforms.py
View file

@ -120,7 +120,7 @@ class DataField(ExtendedNode):
if extend is None: if extend is None:
ExtendedNode.__init__(self, 'field') ExtendedNode.__init__(self, 'field')
self.type = typ self.type_ = typ
self.var = var self.var = var
if value is not None: if value is not None:
self.value = value self.value = value
@ -248,7 +248,7 @@ class DataField(ExtendedNode):
self.delChild(t) self.delChild(t)
return locals() return locals()
def is_valid(self): def is_valid(self):
return True return True
@ -463,7 +463,7 @@ class ListMultiField(ListField):
def iter_values(self): def iter_values(self):
for element in self.getTags('value'): for element in self.getTags('value'):
yield element.getData() yield element.getData()
def is_valid(self): def is_valid(self):
if not self.required: if not self.required:
return True return True
@ -577,7 +577,7 @@ class DataRecord(ExtendedNode):
def __getitem__(self, item): def __getitem__(self, item):
return self.vars[item] return self.vars[item]
def is_valid(self): def is_valid(self):
for f in self.iter_fields(): for f in self.iter_fields():
if not f.is_valid(): if not f.is_valid():

8
src/common/jingle_ft.py
View file

@ -186,7 +186,7 @@ class JingleFileTransfer(JingleContent):
fingerprint = None fingerprint = None
if self.use_security: if self.use_security:
fingerprint = 'client' fingerprint = 'client'
if self.transport.type == TransportType.SOCKS5: if self.transport.type_ == TransportType.SOCKS5:
gajim.socks5queue.connect_to_hosts(self.session.connection.name, gajim.socks5queue.connect_to_hosts(self.session.connection.name,
self.file_props.sid, self.on_connect, self.file_props.sid, self.on_connect,
self._on_connect_error, fingerprint=fingerprint, self._on_connect_error, fingerprint=fingerprint,
@ -272,7 +272,7 @@ class JingleFileTransfer(JingleContent):
action=None): action=None):
# Sets up a few transport specific things for the file transfer # Sets up a few transport specific things for the file transfer
if self.transport.type == TransportType.IBB: if self.transport.type_ == TransportType.IBB:
# No action required, just set the state to transfering # No action required, just set the state to transfering
self.state = STATE_TRANSFERING self.state = STATE_TRANSFERING
@ -323,11 +323,11 @@ class JingleFileTransfer(JingleContent):
if self.weinitiate: if self.weinitiate:
listener = gajim.socks5queue.start_listener(port, sha_str, listener = gajim.socks5queue.start_listener(port, sha_str,
self._store_socks5_sid, self.file_props, self._store_socks5_sid, self.file_props,
fingerprint=fingerprint, type='sender') fingerprint=fingerprint, typ='sender')
else: else:
listener = gajim.socks5queue.start_listener(port, sha_str, listener = gajim.socks5queue.start_listener(port, sha_str,
self._store_socks5_sid, self.file_props, self._store_socks5_sid, self.file_props,
fingerprint=fingerprint, type='receiver') fingerprint=fingerprint, typ='receiver')
if not listener: if not listener:
# send error message, notify the user # send error message, notify the user

4
src/common/jingle_ftstates.py
View file

@ -219,8 +219,8 @@ class StateTransfering(JingleFileTransferStates):
self.jft.session.connection.name, mode) self.jft.session.connection.name, mode)
def action(self, args=None): def action(self, args=None):
if self.jft.transport.type == TransportType.IBB: if self.jft.transport.type_ == TransportType.IBB:
self.__start_IBB_transfer(self.jft.session.connection) self.__start_IBB_transfer(self.jft.session.connection)
elif self.jft.transport.type == TransportType.SOCKS5: elif self.jft.transport.type_ == TransportType.SOCKS5:
self.__start_SOCK5_transfer() self.__start_SOCK5_transfer()

2
src/common/jingle_transport.py
View file

@ -47,7 +47,7 @@ class JingleTransport(object):
""" """
def __init__(self, type_): def __init__(self, type_):
self.type = type_ self.type_ = type_
self.candidates = [] self.candidates = []
self.remote_candidates = [] self.remote_candidates = []

26
src/common/pep.py
View file

@ -211,14 +211,14 @@ import gtkgui_helpers
class AbstractPEP(object): class AbstractPEP(object):
type = '' type_ = ''
namespace = '' namespace = ''
@classmethod @classmethod
def get_tag_as_PEP(cls, jid, account, event_tag): def get_tag_as_PEP(cls, jid, account, event_tag):
items = event_tag.getTag('items', {'node': cls.namespace}) items = event_tag.getTag('items', {'node': cls.namespace})
if items: 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) return cls(jid, account, items)
else: else:
return None return None
@ -237,18 +237,18 @@ class AbstractPEP(object):
def _update_contacts(self, jid, account): def _update_contacts(self, jid, account):
for contact in gajim.contacts.get_contacts(account, jid): for contact in gajim.contacts.get_contacts(account, jid):
if self._retracted: if self._retracted:
if self.type in contact.pep: if self.type_ in contact.pep:
del contact.pep[self.type] del contact.pep[self.type_]
else: else:
contact.pep[self.type] = self contact.pep[self.type_] = self
def _update_account(self, account): def _update_account(self, account):
acc = gajim.connections[account] acc = gajim.connections[account]
if self._retracted: if self._retracted:
if self.type in acc.pep: if self.type_ in acc.pep:
del acc.pep[self.type] del acc.pep[self.type_]
else: else:
acc.pep[self.type] = self acc.pep[self.type_] = self
def asPixbufIcon(self): def asPixbufIcon(self):
'''SHOULD be implemented by subclasses''' '''SHOULD be implemented by subclasses'''
@ -262,7 +262,7 @@ class AbstractPEP(object):
class UserMoodPEP(AbstractPEP): class UserMoodPEP(AbstractPEP):
'''XEP-0107: User Mood''' '''XEP-0107: User Mood'''
type = 'mood' type_ = 'mood'
namespace = xmpp.NS_MOOD namespace = xmpp.NS_MOOD
def _extract_info(self, items): def _extract_info(self, items):
@ -308,7 +308,7 @@ class UserMoodPEP(AbstractPEP):
class UserTunePEP(AbstractPEP): class UserTunePEP(AbstractPEP):
'''XEP-0118: User Tune''' '''XEP-0118: User Tune'''
type = 'tune' type_ = 'tune'
namespace = xmpp.NS_TUNE namespace = xmpp.NS_TUNE
def _extract_info(self, items): def _extract_info(self, items):
@ -354,7 +354,7 @@ class UserTunePEP(AbstractPEP):
class UserActivityPEP(AbstractPEP): class UserActivityPEP(AbstractPEP):
'''XEP-0108: User Activity''' '''XEP-0108: User Activity'''
type = 'activity' type_ = 'activity'
namespace = xmpp.NS_ACTIVITY namespace = xmpp.NS_ACTIVITY
def _extract_info(self, items): def _extract_info(self, items):
@ -420,7 +420,7 @@ class UserActivityPEP(AbstractPEP):
class UserNicknamePEP(AbstractPEP): class UserNicknamePEP(AbstractPEP):
'''XEP-0172: User Nickname''' '''XEP-0172: User Nickname'''
type = 'nickname' type_ = 'nickname'
namespace = xmpp.NS_NICK namespace = xmpp.NS_NICK
def _extract_info(self, items): def _extract_info(self, items):
@ -449,7 +449,7 @@ class UserNicknamePEP(AbstractPEP):
class UserLocationPEP(AbstractPEP): class UserLocationPEP(AbstractPEP):
'''XEP-0080: User Location''' '''XEP-0080: User Location'''
type = 'location' type_ = 'location'
namespace = xmpp.NS_LOCATION namespace = xmpp.NS_LOCATION
def _extract_info(self, items): def _extract_info(self, items):

10
src/common/resolver.py
View file

@ -295,23 +295,23 @@ class NsLookup(IdleCommand):
IdleCommand.__init__(self, on_result) IdleCommand.__init__(self, on_result)
self.commandtimeout = 10 self.commandtimeout = 10
self.host = host.lower() self.host = host.lower()
self.type = type.lower() self.type_ = type.lower()
if not host_pattern.match(self.host): if not host_pattern.match(self.host):
# invalid host name # invalid host name
log.error('Invalid host: %s' % self.host) log.error('Invalid host: %s' % self.host)
self.canexecute = False self.canexecute = False
return return
if not ns_type_pattern.match(self.type): if not ns_type_pattern.match(self.type_):
log.error('Invalid querytype: %s' % self.type) log.error('Invalid querytype: %s' % self.type_)
self.canexecute = False self.canexecute = False
return return
def _compose_command_args(self): def _compose_command_args(self):
return ['nslookup', '-type=' + self.type, self.host] return ['nslookup', '-type=' + self.type_, self.host]
def _return_result(self): def _return_result(self):
if self.result_handler: if self.result_handler:
self.result_handler(self.host, self.type, self.result) self.result_handler(self.host, self.type_, self.result)
self.result_handler = None self.result_handler = None
# below lines is on how to use API and assist in testing # below lines is on how to use API and assist in testing

123
src/common/socks5.py
View file

@ -82,18 +82,18 @@ class SocksQueue:
self.on_success = {} # {id: cb} self.on_success = {} # {id: cb}
self.on_failure = {} # {id: cb} self.on_failure = {} # {id: cb}
def start_listener(self, port, sha_str, sha_handler, file_props, fingerprint=None, def start_listener(self, port, sha_str, sha_handler, file_props,
type='sender'): fingerprint=None, typ='sender'):
""" """
Start waiting for incomming connections on (host, port) and do a socks5 Start waiting for incomming connections on (host, port) and do a socks5
authentication using sid for generated SHA authentication using sid for generated SHA
""" """
sid = file_props.sid sid = file_props.sid
self.type = type # It says whether we are sending or receiving self.type_ = typ # It says whether we are sending or receiving
self.sha_handlers[sha_str] = (sha_handler, sid) self.sha_handlers[sha_str] = (sha_handler, sid)
if self.listener is None or self.listener.connections == []: if self.listener is None or self.listener.connections == []:
self.listener = Socks5Listener(self.idlequeue, port, file_props, self.listener = Socks5Listener(self.idlequeue, port, file_props,
fingerprint=fingerprint) fingerprint=fingerprint)
self.listener.queue = self self.listener.queue = self
self.listener.bind() self.listener.bind()
else: else:
@ -135,9 +135,9 @@ class SocksQueue:
else: else:
fp = fingerprint fp = fingerprint
if receiving: if receiving:
self.type = 'receiver' self.type_ = 'receiver'
socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost,
file_props, fingerprint=fp) sid, file_props, fingerprint=fp)
self.add_sockobj(account, socks5obj) self.add_sockobj(account, socks5obj)
else: else:
if file_props.sha_str: if file_props.sha_str:
@ -145,7 +145,7 @@ class SocksQueue:
else: else:
idx = self.idx idx = self.idx
self.idx = self.idx + 1 self.idx = self.idx + 1
self.type = 'sender' self.type_ = 'sender'
if 'type' in streamhost and streamhost['type'] == 'proxy': if 'type' in streamhost and streamhost['type'] == 'proxy':
file_props.is_a_proxy = True file_props.is_a_proxy = True
file_props.proxy_sender = streamhost['target'] file_props.proxy_sender = streamhost['target']
@ -155,7 +155,7 @@ class SocksQueue:
port=int(streamhost['port']),fingerprint=fp, port=int(streamhost['port']),fingerprint=fp,
connected=False, file_props=file_props) connected=False, file_props=file_props)
socks5obj.streamhost = streamhost socks5obj.streamhost = streamhost
self.add_sockobj(account, socks5obj, type='sender') self.add_sockobj(account, socks5obj, type_='sender')
streamhost['idx'] = socks5obj.queue_idx streamhost['idx'] = socks5obj.queue_idx
@ -168,7 +168,7 @@ class SocksQueue:
if host != streamhost and 'idx' in host: if host != streamhost and 'idx' in host:
if host['state'] == 1: if host['state'] == 1:
# remove current # remove current
if self.type == 'sender': if self.type_ == 'sender':
self.remove_sender(streamhost['idx'], False) self.remove_sender(streamhost['idx'], False)
else: else:
self.remove_receiver(streamhost['idx']) self.remove_receiver(streamhost['idx'])
@ -176,7 +176,7 @@ class SocksQueue:
# set state -2, meaning that this streamhost is stopped, # set state -2, meaning that this streamhost is stopped,
# but it may be connectected later # but it may be connectected later
if host['state'] >= 0: if host['state'] >= 0:
if self.type == 'sender': if self.type_ == 'sender':
self.remove_sender(host['idx'], False) self.remove_sender(host['idx'], False)
else: else:
self.remove_receiver(host['idx']) self.remove_receiver(host['idx'])
@ -206,8 +206,8 @@ class SocksQueue:
if host['state'] == -2: if host['state'] == -2:
host['state'] = 0 host['state'] = 0
# FIXME: make the sender reconnect also # FIXME: make the sender reconnect also
client = Socks5ReceiverClient(self.idlequeue, host, host['sid'], client = Socks5ReceiverClient(self.idlequeue, host,
file_props) host['sid'], file_props)
self.add_sockobj(client.account, client) self.add_sockobj(client.account, client)
host['idx'] = client.queue_idx host['idx'] = client.queue_idx
# we still have chances to connect # we still have chances to connect
@ -239,12 +239,12 @@ class SocksQueue:
file_props.failure_cb(file_props.sid) file_props.failure_cb(file_props.sid)
file_props.failure_cb = None file_props.failure_cb = None
def add_sockobj(self, account, sockobj, type='receiver'): def add_sockobj(self, account, sockobj, type_='receiver'):
""" """
Add new file a sockobj type receiver or sender, and use it to connect Add new file a sockobj type receiver or sender, and use it to connect
to server to server
""" """
if type == 'receiver': if type_ == 'receiver':
self._add(sockobj, self.readers, sockobj.file_props, self.idx) self._add(sockobj, self.readers, sockobj.file_props, self.idx)
else: else:
self._add(sockobj, self.senders, sockobj.file_props, self.idx) self._add(sockobj, self.senders, sockobj.file_props, self.idx)
@ -311,7 +311,7 @@ class SocksQueue:
if file_props.name in key and file_props.sid in key \ if file_props.name in key and file_props.sid in key \
and self.senders[key].mode == mode: and self.senders[key].mode == mode:
log.info("socks5: sending file") log.info('socks5: sending file')
sender = self.senders[key] sender = self.senders[key]
file_props.streamhost_used = True file_props.streamhost_used = True
sender.account = account sender.account = account
@ -324,7 +324,7 @@ class SocksQueue:
fp = FilesProp.getFileProp(account, sid) fp = FilesProp.getFileProp(account, sid)
if not fp: if not fp:
log.warning('trying to remove a file props that doesnt exist ' + log.warning('trying to remove a file props that doesnt exist ' +
'from account ' + str(account) + ' and sid ' + str(sid)) 'from account ' + str(account) + ' and sid ' + str(sid))
return return
if sid in self.on_success: if sid in self.on_success:
del self.on_success[fp.sid] del self.on_success[fp.sid]
@ -347,7 +347,7 @@ class SocksQueue:
def on_connection_accepted(self, sock, listener): def on_connection_accepted(self, sock, listener):
sock_hash = sock.__hash__() sock_hash = sock.__hash__()
if self.type == 'sender' and \ if self.type_ == 'sender' and \
not self.isHashInSockObjs(self.senders, sock_hash): not self.isHashInSockObjs(self.senders, sock_hash):
sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self,
@ -358,8 +358,8 @@ class SocksQueue:
self.idlequeue.plug_idle(sockobj, False, True) self.idlequeue.plug_idle(sockobj, False, True)
self.connected += 1 self.connected += 1
if self.type == 'receiver' and \ if self.type_ == 'receiver' and \
not self.isHashInSockObjs(self.readers, sock_hash): not self.isHashInSockObjs(self.readers, sock_hash):
sh = {} sh = {}
sh['host'] = sock[1][0] sh['host'] = sock[1][0]
sh['port'] = sock[1][1] sh['port'] = sock[1][1]
@ -376,7 +376,6 @@ class SocksQueue:
sockobj.queue = self sockobj.queue = self
self.connected += 1 self.connected += 1
def process_result(self, result, actor): def process_result(self, result, actor):
""" """
Take appropriate actions upon the result: Take appropriate actions upon the result:
@ -465,7 +464,7 @@ class Socks5:
self.remaining_buff = '' self.remaining_buff = ''
self.file = None self.file = None
self.connected = False self.connected = False
self.type = '' self.type_ = ''
self.mode = '' self.mode = ''
@ -506,7 +505,6 @@ class Socks5:
def do_connect(self): def do_connect(self):
try: try:
#self._sock.setblocking(True)
self._sock.connect(self._server) self._sock.connect(self._server)
self._sock.setblocking(False) self._sock.setblocking(False)
self._send=self._sock.send self._send=self._sock.send
@ -552,7 +550,6 @@ class Socks5:
else: else:
# stop transfer, there is no error code for this # stop transfer, there is no error code for this
self.pollend() self.pollend()
else: else:
if self.mode == 'client': if self.mode == 'client':
self.queue.reconnect_client(self, self.streamhost) self.queue.reconnect_client(self, self.streamhost)
@ -580,8 +577,8 @@ class Socks5:
def get_fd(self): def get_fd(self):
""" """
Test if file is already open and return its fd, or just open the file and Test if file is already open and return its fd, or just open the file
return the fd and return the fd
""" """
if self.file_props.fd: if self.file_props.fd:
fd = self.file_props.fd fd = self.file_props.fd
@ -900,8 +897,8 @@ class Socks5:
return hashlib.sha1('%s%s%s' % (self.sid, return hashlib.sha1('%s%s%s' % (self.sid,
self.file_props.proxy_sender, self.file_props.proxy_sender,
self.file_props.proxy_receiver)).hexdigest() self.file_props.proxy_receiver)).hexdigest()
return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).\ return hashlib.sha1('%s%s%s' % (self.sid, self.initiator,
hexdigest() self.target)).hexdigest()
class Socks5Sender(IdleObject): class Socks5Sender(IdleObject):
@ -911,21 +908,18 @@ class Socks5Sender(IdleObject):
def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, def __init__(self, idlequeue, sock_hash, parent, _sock, host=None,
port=None, fingerprint = None, connected=True, file_props={}): port=None, fingerprint = None, connected=True, file_props={}):
self.fingerprint = fingerprint self.fingerprint = fingerprint
self.queue_idx = sock_hash self.queue_idx = sock_hash
self.queue = parent self.queue = parent
self.file_props = file_props self.file_props = file_props
self.proxy = False self.proxy = False
self._sock = _sock self._sock = _sock
if _sock is not None: if _sock is not None:
if self.fingerprint is not None: if self.fingerprint is not None:
self._sock = OpenSSL.SSL.Connection( self._sock = OpenSSL.SSL.Connection(
jingle_xtls.get_context('server'), _sock) jingle_xtls.get_context('server'), _sock)
else: else:
self._sock.setblocking(False) self._sock.setblocking(False)
@ -947,7 +941,7 @@ class Socks5Sender(IdleObject):
self.file_props.elapsed_time = 0 self.file_props.elapsed_time = 0
self.file_props.last_time = self.idlequeue.current_time() self.file_props.last_time = self.idlequeue.current_time()
self.file_props.received_len = 0 self.file_props.received_len = 0
self.type = 'sender' self.type_ = 'sender'
def start_transfer(self): def start_transfer(self):
""" """
@ -955,9 +949,7 @@ class Socks5Sender(IdleObject):
""" """
return self.write_next() return self.write_next()
def set_connection_sock(self, _sock): def set_connection_sock(self, _sock):
self._sock = _sock self._sock = _sock
if self.fingerprint is not None: if self.fingerprint is not None:
@ -1023,7 +1015,6 @@ class Socks5Receiver(IdleObject):
self.file_props.stalled = False self.file_props.stalled = False
self.file_props.received_len = 0 self.file_props.received_len = 0
def receive_file(self): def receive_file(self):
""" """
Start receiving the file over verified connection Start receiving the file over verified connection
@ -1077,9 +1068,7 @@ class Socks5Receiver(IdleObject):
class Socks5Server(Socks5): class Socks5Server(Socks5):
def __init__(self, idlequeue, host, port, initiator, target, sid): def __init__(self, idlequeue, host, port, initiator, target, sid):
Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)
self.mode = 'server' self.mode = 'server'
def main(self): def main(self):
@ -1103,7 +1092,6 @@ class Socks5Server(Socks5):
self.idlequeue.plug_idle(self, True, False) self.idlequeue.plug_idle(self, True, False)
return None return None
def pollin(self): def pollin(self):
self.idlequeue.remove_timeout(self.fd) self.idlequeue.remove_timeout(self.fd)
if self.connected: if self.connected:
@ -1117,7 +1105,7 @@ class Socks5Server(Socks5):
elif self.state == 5: elif self.state == 5:
self.state = 7 self.state = 7
if self.type == 'sender': if self.type_ == 'sender':
# We wait for the end of the negotiation to # We wait for the end of the negotiation to
# send the file # send the file
self.idlequeue.plug_idle(self, False, False) self.idlequeue.plug_idle(self, False, False)
@ -1128,7 +1116,8 @@ class Socks5Server(Socks5):
elif self.state == 7: elif self.state == 7:
if self.file_props.paused: if self.file_props.paused:
self.file_props.continue_cb = self.continue_paused_transfer self.file_props.continue_cb = \
self.continue_paused_transfer
self.idlequeue.plug_idle(self, False, False) self.idlequeue.plug_idle(self, False, False)
return return
self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT)
@ -1140,7 +1129,6 @@ class Socks5Server(Socks5):
else: else:
self.disconnect() self.disconnect()
def pollend(self): def pollend(self):
self.state = 8 # end connection self.state = 8 # end connection
self.disconnect() self.disconnect()
@ -1181,9 +1169,7 @@ class Socks5Server(Socks5):
class Socks5Client(Socks5): class Socks5Client(Socks5):
def __init__(self, idlequeue, host, port, initiator, target, sid): def __init__(self, idlequeue, host, port, initiator, target, sid):
Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) Socks5.__init__(self, idlequeue, host, port, initiator, target, sid)
self.mode = 'client' self.mode = 'client'
def main(self, timeout=0): def main(self, timeout=0):
@ -1226,9 +1212,8 @@ class Socks5Client(Socks5):
if self.queue.on_success: if self.queue.on_success:
result = self.queue.send_success_reply(self.file_props, result = self.queue.send_success_reply(self.file_props,
self.streamhost) self.streamhost)
if self.type == 'sender' and self.proxy: if self.type_ == 'sender' and self.proxy:
self.queue.process_result( self.send_file() self.queue.process_result(self.send_file(), self)
, self)
return return
if result == 0: if result == 0:
@ -1264,7 +1249,6 @@ class Socks5Client(Socks5):
self.state += 1 self.state += 1
return None return None
def pollin(self): def pollin(self):
self.idlequeue.remove_timeout(self.fd) self.idlequeue.remove_timeout(self.fd)
if self.connected: if self.connected:
@ -1325,33 +1309,24 @@ class Socks5Client(Socks5):
self.queue.reconnect_client(self, self.streamhost) self.queue.reconnect_client(self, self.streamhost)
class Socks5SenderClient(Socks5Client, Socks5Sender): class Socks5SenderClient(Socks5Client, Socks5Sender):
def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, def __init__(self, idlequeue, sock_hash, parent,_sock, host=None,
port=None, fingerprint = None, connected=True, file_props={}): port=None, fingerprint = None, connected=True, file_props={}):
Socks5Client.__init__(self, idlequeue, host, port, None, None, Socks5Client.__init__(self, idlequeue, host, port, None, None,
file_props.sid) file_props.sid)
Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock,
host, port, fingerprint , connected, file_props) host, port, fingerprint , connected, file_props)
class Socks5SenderServer(Socks5Server, Socks5Sender): class Socks5SenderServer(Socks5Server, Socks5Sender):
def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, def __init__(self, idlequeue, sock_hash, parent,_sock, host=None,
port=None, fingerprint = None, connected=True, file_props={}): port=None, fingerprint = None, connected=True, file_props={}):
Socks5Server.__init__(self, idlequeue, host, port, None, None, Socks5Server.__init__(self, idlequeue, host, port, None, None,
file_props.sid) file_props.sid)
Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock,
host, port, fingerprint , connected, file_props) host, port, fingerprint , connected, file_props)
class Socks5ReceiverClient(Socks5Client, Socks5Receiver): class Socks5ReceiverClient(Socks5Client, Socks5Receiver):
@ -1359,27 +1334,21 @@ class Socks5ReceiverClient(Socks5Client, Socks5Receiver):
def __init__(self, idlequeue, streamhost, sid, file_props = None, def __init__(self, idlequeue, streamhost, sid, file_props = None,
fingerprint=None): fingerprint=None):
Socks5Client.__init__(self, idlequeue, streamhost['host'], Socks5Client.__init__(self, idlequeue, streamhost['host'],
int(streamhost['port']), streamhost['initiator'], int(streamhost['port']), streamhost['initiator'],
streamhost['target'], sid) streamhost['target'], sid)
Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,
fingerprint) fingerprint)
class Socks5ReceiverServer(Socks5Server, Socks5Receiver): class Socks5ReceiverServer(Socks5Server, Socks5Receiver):
def __init__(self, idlequeue, streamhost, sid, file_props = None, def __init__(self, idlequeue, streamhost, sid, file_props = None,
fingerprint=None): fingerprint=None):
Socks5Server.__init__(self, idlequeue, streamhost['host'], Socks5Server.__init__(self, idlequeue, streamhost['host'],
int(streamhost['port']), streamhost['initiator'], int(streamhost['port']), streamhost['initiator'],
streamhost['target'], sid) streamhost['target'], sid)
Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,
fingerprint) fingerprint)
class Socks5Listener(IdleObject): class Socks5Listener(IdleObject):
@ -1395,7 +1364,7 @@ class Socks5Listener(IdleObject):
""" """
self.port = port self.port = port
self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC, self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC,
socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE)
self.ais.sort(reverse=True) # Try IPv6 first self.ais.sort(reverse=True) # Try IPv6 first
self.queue_idx = -1 self.queue_idx = -1
self.idlequeue = idlequeue self.idlequeue = idlequeue
@ -1483,5 +1452,3 @@ class Socks5Listener(IdleObject):
_sock[0].setblocking(False) _sock[0].setblocking(False)
self.connections.append(_sock[0]) self.connections.append(_sock[0])
return _sock return _sock

2
src/common/stanza_session.py
View file

@ -57,7 +57,7 @@ class StanzaSession(object):
''' '''
self.conn = conn self.conn = conn
self.jid = jid self.jid = jid
self.type = type_ self.type_ = type_
self.resource = jid.getResource() self.resource = jid.getResource()
if thread_id: if thread_id:

2
src/config.py
View file

@ -4103,7 +4103,7 @@ class ManagePEPServicesWindow:
def _nec_pep_config_received(self, obj): def _nec_pep_config_received(self, obj):
def on_ok(form, node): def on_ok(form, node):
form.type = 'submit' form.type_ = 'submit'
our_jid = gajim.get_jid_from_account(self.account) our_jid = gajim.get_jid_from_account(self.account)
gajim.connections[self.account].send_pb_configure(our_jid, node, form) gajim.connections[self.account].send_pb_configure(our_jid, node, form)
window = dialogs.DataFormWindow(obj.form, (on_ok, obj.node)) window = dialogs.DataFormWindow(obj.form, (on_ok, obj.node))

26
src/dataforms_widget.py
View file

@ -185,7 +185,7 @@ class DataFormWidget(gtk.Alignment, object):
# note: we store also text-private and hidden fields, # note: we store also text-private and hidden fields,
# we just do not display them. # we just do not display them.
# TODO: boolean fields # TODO: boolean fields
#elif field.type=='boolean': fieldtypes.append(bool) #elif field.type_=='boolean': fieldtypes.append(bool)
fieldtypes.append(str) fieldtypes.append(str)
fieldvars.append(field.var) fieldvars.append(field.var)
@ -215,7 +215,7 @@ class DataFormWidget(gtk.Alignment, object):
self.clean_data_form = self.clean_multiple_data_form self.clean_data_form = self.clean_multiple_data_form
readwrite = self._data_form.type != 'result' readwrite = self._data_form.type_ != 'result'
if not readwrite: if not readwrite:
self.buttons_vbox.set_no_show_all(True) self.buttons_vbox.set_no_show_all(True)
self.buttons_vbox.hide() self.buttons_vbox.hide()
@ -343,25 +343,25 @@ class SingleForm(gtk.Table, object):
linecounter = 0 linecounter = 0
# is the form changeable? # is the form changeable?
readwrite = dataform.type != 'result' readwrite = dataform.type_ != 'result'
# for each field... # for each field...
for field in self._data_form.iter_fields(): for field in self._data_form.iter_fields():
if field.type == 'hidden': continue if field.type_ == 'hidden': continue
commonlabel = True commonlabel = True
commonlabelcenter = False commonlabelcenter = False
commonwidget = True commonwidget = True
widget = None widget = None
if field.type == 'boolean': if field.type_ == 'boolean':
commonlabelcenter = True commonlabelcenter = True
widget = gtk.CheckButton() widget = gtk.CheckButton()
widget.connect('toggled', self.on_boolean_checkbutton_toggled, widget.connect('toggled', self.on_boolean_checkbutton_toggled,
field) field)
widget.set_active(field.value) widget.set_active(field.value)
elif field.type == 'fixed': elif field.type_ == 'fixed':
leftattach = 1 leftattach = 1
rightattach = 2 rightattach = 2
if field.label is None: if field.label is None:
@ -375,7 +375,7 @@ class SingleForm(gtk.Table, object):
self.attach(widget, leftattach, rightattach, linecounter, self.attach(widget, leftattach, rightattach, linecounter,
linecounter+1, xoptions=gtk.FILL, yoptions=gtk.FILL) linecounter+1, xoptions=gtk.FILL, yoptions=gtk.FILL)
elif field.type == 'list-single': elif field.type_ == 'list-single':
# TODO: What if we have radio buttons and non-required field? # TODO: What if we have radio buttons and non-required field?
# TODO: We cannot deactivate them all... # TODO: We cannot deactivate them all...
if len(field.options) < 6: if len(field.options) < 6:
@ -409,7 +409,7 @@ class SingleForm(gtk.Table, object):
widget.connect('changed', on_list_single_combobox_changed, field) widget.connect('changed', on_list_single_combobox_changed, field)
widget.set_sensitive(readwrite) widget.set_sensitive(readwrite)
elif field.type == 'list-multi': elif field.type_ == 'list-multi':
# TODO: When more than few choices, make a list # TODO: When more than few choices, make a list
if len(field.options) < 6: if len(field.options) < 6:
# 5 option max: show checkbutton # 5 option max: show checkbutton
@ -439,12 +439,12 @@ class SingleForm(gtk.Table, object):
on_list_multi_treeview_changed, field) on_list_multi_treeview_changed, field)
tv.set_sensitive(readwrite) tv.set_sensitive(readwrite)
elif field.type == 'jid-single': elif field.type_ == 'jid-single':
widget = gtk.Entry() widget = gtk.Entry()
widget.connect('changed', self.on_text_single_entry_changed, field) widget.connect('changed', self.on_text_single_entry_changed, field)
widget.set_text(field.value) widget.set_text(field.value)
elif field.type == 'jid-multi': elif field.type_ == 'jid-multi':
commonwidget = False commonwidget = False
xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui',
@ -493,14 +493,14 @@ class SingleForm(gtk.Table, object):
del xml del xml
elif field.type == 'text-private': elif field.type_ == 'text-private':
commonlabelcenter = True commonlabelcenter = True
widget = gtk.Entry() widget = gtk.Entry()
widget.connect('changed', self.on_text_single_entry_changed, field) widget.connect('changed', self.on_text_single_entry_changed, field)
widget.set_visibility(False) widget.set_visibility(False)
widget.set_text(field.value) widget.set_text(field.value)
elif field.type == 'text-multi': elif field.type_ == 'text-multi':
# TODO: bigger text view # TODO: bigger text view
commonwidget = False commonwidget = False
@ -524,7 +524,7 @@ class SingleForm(gtk.Table, object):
self.attach(widget, 1, 2, linecounter, linecounter+1) self.attach(widget, 1, 2, linecounter, linecounter+1)
else: else:
# field.type == 'text-single' or field.type is nonstandard: # field.type_ == 'text-single' or field.type_ is nonstandard:
# JEP says that if we don't understand some type, we # JEP says that if we don't understand some type, we
# should handle it as text-single # should handle it as text-single
commonlabelcenter = True commonlabelcenter = True

2
src/groupchat_control.py
View file

@ -950,7 +950,7 @@ class GroupchatControl(ChatControlBase):
if not self.form_widget: if not self.form_widget:
return return
form_node = self.form_widget.data_form.get_purged() form_node = self.form_widget.data_form.get_purged()
form_node.type = 'submit' form_node.type_ = 'submit'
obj.conn.send_captcha(self.room_jid, form_node) obj.conn.send_captcha(self.room_jid, form_node)
self.form_widget.hide() self.form_widget.hide()
self.form_widget.destroy() self.form_widget.destroy()

2
src/search_window.py
View file

@ -89,7 +89,7 @@ class SearchWindow:
def on_search_button_clicked(self, button): def on_search_button_clicked(self, button):
if self.is_form: if self.is_form:
self.data_form_widget.data_form.type = 'submit' self.data_form_widget.data_form.type_ = 'submit'
gajim.connections[self.account].send_search_form(self.jid, gajim.connections[self.account].send_search_form(self.jid,
self.data_form_widget.data_form.get_purged(), True) self.data_form_widget.data_form.get_purged(), True)
else: else:

2
src/statusicon.py
View file

@ -439,7 +439,7 @@ class StatusIcon:
def on_clicked(self, widget, event): def on_clicked(self, widget, event):
self.on_tray_leave_notify_event(widget, None) self.on_tray_leave_notify_event(widget, None)
if event.type != gtk.gdk.BUTTON_PRESS: if event.type_ != gtk.gdk.BUTTON_PRESS:
return return
if event.button == 1: # Left click if event.button == 1: # Left click
self.on_left_click() self.on_left_click()

2
test/lib/gajim_mocks.py
View file

@ -133,7 +133,7 @@ class MockSession(Mock):
self.conn = conn self.conn = conn
self.jid = jid self.jid = jid
self.type = type_ self.type_ = type_
self.thread_id = thread_id self.thread_id = thread_id
if not self.thread_id: if not self.thread_id: