Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10371 - in branches/bosh_support: src src/common src/common/xmpp test test/lib
by tomk＠gajim.org 31 Aug '08

31 Aug '08

Author: tomk Date: 2008-09-01 01:40:06 +0200 (Mon, 01 Sep 2008) New Revision: 10371 Added: branches/bosh_support/src/common/resolver.py branches/bosh_support/test/lib/ branches/bosh_support/test/lib/__init__.py branches/bosh_support/test/lib/data.py branches/bosh_support/test/lib/mock.py branches/bosh_support/test/lib/mocks.py branches/bosh_support/test/lib/notify.py branches/bosh_support/test/test_resolver.py Removed: branches/bosh_support/src/common/nslookup.py branches/bosh_support/test/mock.py branches/bosh_support/test/mocks.py branches/bosh_support/test/notify.py Modified: branches/bosh_support/src/common/xmpp/client_nb.py branches/bosh_support/src/gajim.py Log: - renamed src/common/nslookup.py to resolver.py - refactored resolver code and added asynchronous resolver based on patch by Damien Thebault[1] * Uses libasyncns-python[2]. If it's not available, old nslookup resolver is used) * works for SRV requests only at the moment [1] https://www.lagaule.org/pipermail/gajim-devel/2008-July/000460.html [2] https://code.launchpad.net/libasyncns-python Deleted: branches/bosh_support/src/common/nslookup.py =================================================================== --- branches/bosh_support/src/common/nslookup.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/src/common/nslookup.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -1,325 +0,0 @@ -## common/nslookup.py -## -## Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import sys -import os -import re - -from xmpp.idlequeue import * - -if os.name == 'nt': - from subprocess import * # python24 only. we ask this for Windows -elif os.name == 'posix': - import fcntl - -# it is good to check validity of arguments, when calling system commands -ns_type_pattern = re.compile('^[a-z]+$') - -# match srv host_name -host_pattern = re.compile('^[a-z0-9\-._]*[a-z0-9]\.[a-z]{2,}$') - -class Resolver: - def __init__(self, idlequeue): - self.idlequeue = idlequeue - # dict {host : list of srv records} - self.resolved_hosts = {} - # dict {host : list of callbacks} - self.handlers = {} - - def parse_srv_result(self, fqdn, result): - ''' parse the output of nslookup command and return list of - properties: 'host', 'port','weight', 'priority' corresponding to the found - srv hosts ''' - if os.name == 'nt': - return self._parse_srv_result_nt(fqdn, result) - elif os.name == 'posix': - return self._parse_srv_result_posix(fqdn, result) - - def _parse_srv_result_nt(self, fqdn, result): - # output from win32 nslookup command - if not result: - return [] - hosts = [] - lines = result.replace('\r','').split('\n') - current_host = None - for line in lines: - line = line.lstrip() - if line == '': - continue - if line.startswith(fqdn): - rest = line[len(fqdn):] - if rest.find('service') > -1: - current_host = {} - elif isinstance(current_host, dict): - res = line.strip().split('=') - if len(res) != 2: - if len(current_host) == 4: - hosts.append(current_host) - current_host = None - continue - prop_type = res[0].strip() - prop_value = res[1].strip() - if prop_type.find('prio') > -1: - try: - current_host['prio'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('weight') > -1: - try: - current_host['weight'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('port') > -1: - try: - current_host['port'] = int(prop_value) - except ValueError: - continue - elif prop_type.find('host') > -1: - # strip '.' at the end of hostname - if prop_value[-1] == '.': - prop_value = prop_value[:-1] - current_host['host'] = prop_value - if len(current_host) == 4: - hosts.append(current_host) - current_host = None - return hosts - - def _parse_srv_result_posix(self, fqdn, result): - # typical output of bind-tools nslookup command: - # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org. - if not result: - return [] - hosts = [] - lines = result.split('\n') - for line in lines: - if line == '': - continue - if line.startswith(fqdn): - rest = line[len(fqdn):].split('=') - if len(rest) != 2: - continue - answer_type, props_str = rest - if answer_type.strip() != 'service': - continue - props = props_str.strip().split(' ') - if len(props) < 4: - continue - prio, weight, port, host = props[-4:] - if host[-1] == '.': - host = host[:-1] - try: - prio = int(prio) - weight = int(weight) - port = int(port) - except ValueError: - continue - hosts.append({'host': host, 'port': port,'weight': weight, - 'prio': prio}) - return hosts - - def _on_ready(self, host, result): - # nslookup finished, parse the result and call the handlers - result_list = self.parse_srv_result(host, result) - - # practically it is impossible to be the opposite, but who knows :) - if not self.resolved_hosts.has_key(host): - self.resolved_hosts[host] = result_list - if self.handlers.has_key(host): - for callback in self.handlers[host]: - callback(host, result_list) - del(self.handlers[host]) - - def start_resolve(self, host): - ''' spawn new nslookup process and start waiting for results ''' - ns = NsLookup(self._on_ready, host) - ns.set_idlequeue(self.idlequeue) - ns.commandtimeout = 10 - ns.start() - - def resolve(self, host, on_ready): - if not host: - # empty host, return empty list of srv records - on_ready([]) - return - if self.resolved_hosts.has_key(host): - # host is already resolved, return cached values - on_ready(host, self.resolved_hosts[host]) - return - if self.handlers.has_key(host): - # host is about to be resolved by another connection, - # attach our callback - self.handlers[host].append(on_ready) - else: - # host has never been resolved, start now - self.handlers[host] = [on_ready] - self.start_resolve(host) - -# TODO: move IdleCommand class in other file, maybe helpers ? -class IdleCommand(IdleObject): - def __init__(self, on_result): - # how long (sec.) to wait for result ( 0 - forever ) - # it is a class var, instead of a constant and we can override it. - self.commandtimeout = 0 - # when we have some kind of result (valid, ot not) we call this handler - self.result_handler = on_result - # if it is True, we can safetely execute the command - self.canexecute = True - self.idlequeue = None - self.result ='' - - def set_idlequeue(self, idlequeue): - self.idlequeue = idlequeue - - def _return_result(self): - if self.result_handler: - self.result_handler(self.result) - self.result_handler = None - - def _compose_command_args(self): - return ['echo', 'da'] - - def _compose_command_line(self): - ''' return one line representation of command and its arguments ''' - return reduce(lambda left, right: left + ' ' + right, self._compose_command_args()) - - def wait_child(self): - if self.pipe.poll() is None: - # result timeout - if self.endtime < self.idlequeue.current_time(): - self._return_result() - self.pipe.stdout.close() - self.pipe.stdin.close() - else: - # child is still active, continue to wait - self.idlequeue.set_alarm(self.wait_child, 0.1) - else: - # child has quit - self.result = self.pipe.stdout.read() - self._return_result() - self.pipe.stdout.close() - self.pipe.stdin.close() - def start(self): - if not self.canexecute: - self.result = '' - self._return_result() - return - if os.name == 'nt': - self._start_nt() - elif os.name == 'posix': - self._start_posix() - - def _start_nt(self): - # if gajim is started from noninteraactive shells stdin is closed and - # cannot be forwarded, so we have to keep it open - self.pipe = Popen(self._compose_command_args(), stdout=PIPE, - bufsize = 1024, shell = True, stderr = STDOUT, stdin = PIPE) - if self.commandtimeout >= 0: - self.endtime = self.idlequeue.current_time() + self.commandtimeout - self.idlequeue.set_alarm(self.wait_child, 0.1) - - def _start_posix(self): - self.pipe = os.popen(self._compose_command_line()) - self.fd = self.pipe.fileno() - fcntl.fcntl(self.pipe, fcntl.F_SETFL, os.O_NONBLOCK) - self.idlequeue.plug_idle(self, False, True) - if self.commandtimeout >= 0: - self.idlequeue.set_read_timeout(self.fd, self.commandtimeout) - - def end(self): - self.idlequeue.unplug_idle(self.fd) - try: - self.pipe.close() - except: - pass - - def pollend(self): - self.idlequeue.remove_timeout(self.fd) - self.end() - self._return_result() - - def pollin(self): - try: - res = self.pipe.read() - except Exception, e: - res = '' - if res == '': - return self.pollend() - else: - self.result += res - - def read_timeout(self): - self.end() - self._return_result() - -class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type = 'srv'): - IdleCommand.__init__(self, on_result) - self.commandtimeout = 10 - self.host = host.lower() - self.type = type.lower() - if not host_pattern.match(self.host): - # invalid host name - print >> sys.stderr, 'Invalid host: %s' % self.host - self.canexecute = False - return - if not ns_type_pattern.match(self.type): - print >> sys.stderr, 'Invalid querytype: %s' % self.type - self.canexecute = False - return - - def _compose_command_args(self): - return ['nslookup', '-type=' + self.type , self.host] - - def _return_result(self): - if self.result_handler: - self.result_handler(self.host, self.result) - self.result_handler = None - -# below lines is on how to use API and assist in testing -if __name__ == '__main__': - if os.name == 'posix': - idlequeue = IdleQueue() - elif os.name == 'nt': - idlequeue = SelectIdleQueue() - # testing Resolver class - import gobject - import gtk - - resolver = Resolver(idlequeue) - - def clicked(widget): - global resolver - host = text_view.get_text() - def on_result(host, result_array): - print 'Result:\n' + repr(result_array) - resolver.resolve(host, on_result) - win = gtk.Window() - win.set_border_width(6) - text_view = gtk.Entry() - text_view.set_text('_xmpp-client._tcp.jabber.org') - hbox = gtk.HBox() - hbox.set_spacing(3) - but = gtk.Button(' Lookup SRV ') - hbox.pack_start(text_view, 5) - hbox.pack_start(but, 0) - but.connect('clicked', clicked) - win.add(hbox) - win.show_all() - gobject.timeout_add(200, idlequeue.process) - gtk.main() Added: branches/bosh_support/src/common/resolver.py =================================================================== --- branches/bosh_support/src/common/resolver.py (rev 0) +++ branches/bosh_support/src/common/resolver.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,428 @@ +## common/resolver.py +## +## Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +import sys +import os +import re + +from xmpp.idlequeue import * + +# needed for nslookup +if os.name == 'nt': + from subprocess import * # python24 only. we ask this for Windows +elif os.name == 'posix': + import fcntl + +# it is good to check validity of arguments, when calling system commands +ns_type_pattern = re.compile('^[a-z]+$') + +# match srv host_name +host_pattern = re.compile('^[a-z0-9\-._]*[a-z0-9]\.[a-z]{2,}$') + +USE_LIBASYNCNS = False + +try: + #raise ImportError("Manually disabled libasync") + import libasyncns + USE_LIBASYNCNS = True + log.info("libasyncns-python loaded") +except ImportError: + log.debug("Import of libasyncns-python failed, getaddrinfo will block", exc_info=True) + + # FIXME: Remove these prints before release, replace with a warning dialog. + print >> sys.stderr, "=" * 79 + print >> sys.stderr, "libasyncns-python not installed which means:" + print >> sys.stderr, " - nslookup will be used for SRV and TXT requests" + print >> sys.stderr, " - getaddrinfo will block" + print >> sys.stderr, "libasyncns-python can be found at https://launchpad.net/libasyncns-python" + print >> sys.stderr, "=" * 79 + + +def get_resolver(idlequeue): + if USE_LIBASYNCNS: + return LibAsyncNSResolver() + else: + return NSLookupResolver(idlequeue) + +class CommonResolver(): + def __init__(self): + # dict {"host+type" : list of records} + self.resolved_hosts = {} + # dict {"host+type" : list of callbacks} + self.handlers = {} + + def resolve(self, host, on_ready, type='srv'): + assert(type in ['srv', 'txt']) + if not host: + # empty host, return empty list of srv records + on_ready([]) + return + if self.resolved_hosts.has_key(host+type): + # host is already resolved, return cached values + on_ready(host, self.resolved_hosts[host+type]) + return + if self.handlers.has_key(host+type): + # host is about to be resolved by another connection, + # attach our callback + self.handlers[host+type].append(on_ready) + else: + # host has never been resolved, start now + self.handlers[host+type] = [on_ready] + self.start_resolve(host, type) + + def _on_ready(self, host, type, result_list): + # practically it is impossible to be the opposite, but who knows :) + if not self.resolved_hosts.has_key(host+type): + self.resolved_hosts[host+type] = result_list + if self.handlers.has_key(host+type): + for callback in self.handlers[host+type]: + callback(host, result_list) + del(self.handlers[host+type]) + + def start_resolve(self, host, type): + pass + + +class LibAsyncNSResolver(CommonResolver): + ''' + Asynchronous resolver using libasyncns-python. process() method has to be called + in order to proceed the pending requests. + Based on patch submitted by Damien Thebault. + ''' + def __init__(self): + self.asyncns = libasyncns.Asyncns() + CommonResolver.__init__(self) + + def start_resolve(self, host, type): + type = libasyncns.ns_t_srv + if type == 'txt': type = libasyncns.ns_t_txt + resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type) + resq.userdata = {'host':host, 'type':type} + + # getaddrinfo to be done + #def resolve_name(self, dname, callback): + #resq = self.asyncns.getaddrinfo(dname) + #resq.userdata = {'callback':callback, 'dname':dname} + + def _on_ready(self, host, type, result_list): + if type == libasyncns.ns_t_srv: type = 'srv' + elif type == libasyncns.ns_t_txt: type = 'txt' + + CommonResolver._on_ready(self, host, type, result_list) + + + def process(self): + try: + self.asyncns.wait(False) + resq = self.asyncns.get_next() + except: + return True + if type(resq) == libasyncns.ResQuery: + # TXT or SRV result + while resq is not None: + try: + rl = resq.get_done() + except: + rl = [] + if rl: + for r in rl: + r['prio'] = r['pref'] + self._on_ready( + host = resq.userdata['host'], + type = resq.userdata['type'], + result_list = rl) + try: + resq = self.asyncns.get_next() + except: + resq = None + elif type(resq) == libasyncns.AddrInfoQuery: + # getaddrinfo result (A or AAAA) + rl = resq.get_done() + resq.userdata['callback'](resq.userdata['dname'], rl) + return True + +class NSLookupResolver(CommonResolver): + ''' + Asynchronous DNS resolver calling nslookup. Processing of pending requests + is invoked from idlequeue which is watching file descriptor of pipe of stdout + of nslookup process. + ''' + def __init__(self, idlequeue): + self.idlequeue = idlequeue + self.process = False + CommonResolver.__init__(self) + + def parse_srv_result(self, fqdn, result): + ''' parse the output of nslookup command and return list of + properties: 'host', 'port','weight', 'priority' corresponding to the found + srv hosts ''' + if os.name == 'nt': + return self._parse_srv_result_nt(fqdn, result) + elif os.name == 'posix': + return self._parse_srv_result_posix(fqdn, result) + + def _parse_srv_result_nt(self, fqdn, result): + # output from win32 nslookup command + if not result: + return [] + hosts = [] + lines = result.replace('\r','').split('\n') + current_host = None + for line in lines: + line = line.lstrip() + if line == '': + continue + if line.startswith(fqdn): + rest = line[len(fqdn):] + if rest.find('service') > -1: + current_host = {} + elif isinstance(current_host, dict): + res = line.strip().split('=') + if len(res) != 2: + if len(current_host) == 4: + hosts.append(current_host) + current_host = None + continue + prop_type = res[0].strip() + prop_value = res[1].strip() + if prop_type.find('prio') > -1: + try: + current_host['prio'] = int(prop_value) + except ValueError: + continue + elif prop_type.find('weight') > -1: + try: + current_host['weight'] = int(prop_value) + except ValueError: + continue + elif prop_type.find('port') > -1: + try: + current_host['port'] = int(prop_value) + except ValueError: + continue + elif prop_type.find('host') > -1: + # strip '.' at the end of hostname + if prop_value[-1] == '.': + prop_value = prop_value[:-1] + current_host['host'] = prop_value + if len(current_host) == 4: + hosts.append(current_host) + current_host = None + return hosts + + def _parse_srv_result_posix(self, fqdn, result): + # typical output of bind-tools nslookup command: + # _xmpp-client._tcp.jabber.org service = 30 30 5222 jabber.org. + if not result: + return [] + hosts = [] + lines = result.split('\n') + for line in lines: + if line == '': + continue + if line.startswith(fqdn): + rest = line[len(fqdn):].split('=') + if len(rest) != 2: + continue + answer_type, props_str = rest + if answer_type.strip() != 'service': + continue + props = props_str.strip().split(' ') + if len(props) < 4: + continue + prio, weight, port, host = props[-4:] + if host[-1] == '.': + host = host[:-1] + try: + prio = int(prio) + weight = int(weight) + port = int(port) + except ValueError: + continue + hosts.append({'host': host, 'port': port,'weight': weight, + 'prio': prio}) + return hosts + + def _on_ready(self, host, type, result): + # nslookup finished, parse the result and call the handlers + result_list = self.parse_srv_result(host, result) + CommonResolver._on_ready(self, host, type, result_list) + + + def start_resolve(self, host, type): + ''' spawn new nslookup process and start waiting for results ''' + ns = NsLookup(self._on_ready, host, type) + ns.set_idlequeue(self.idlequeue) + ns.commandtimeout = 10 + ns.start() + + +# TODO: move IdleCommand class in other file, maybe helpers ? +class IdleCommand(IdleObject): + def __init__(self, on_result): + # how long (sec.) to wait for result ( 0 - forever ) + # it is a class var, instead of a constant and we can override it. + self.commandtimeout = 0 + # when we have some kind of result (valid, ot not) we call this handler + self.result_handler = on_result + # if it is True, we can safetely execute the command + self.canexecute = True + self.idlequeue = None + self.result ='' + + def set_idlequeue(self, idlequeue): + self.idlequeue = idlequeue + + def _return_result(self): + if self.result_handler: + self.result_handler(self.result) + self.result_handler = None + + def _compose_command_args(self): + return ['echo', 'da'] + + def _compose_command_line(self): + ''' return one line representation of command and its arguments ''' + return reduce(lambda left, right: left + ' ' + right, self._compose_command_args()) + + def wait_child(self): + if self.pipe.poll() is None: + # result timeout + if self.endtime < self.idlequeue.current_time(): + self._return_result() + self.pipe.stdout.close() + self.pipe.stdin.close() + else: + # child is still active, continue to wait + self.idlequeue.set_alarm(self.wait_child, 0.1) + else: + # child has quit + self.result = self.pipe.stdout.read() + self._return_result() + self.pipe.stdout.close() + self.pipe.stdin.close() + def start(self): + if not self.canexecute: + self.result = '' + self._return_result() + return + if os.name == 'nt': + self._start_nt() + elif os.name == 'posix': + self._start_posix() + + def _start_nt(self): + # if gajim is started from noninteraactive shells stdin is closed and + # cannot be forwarded, so we have to keep it open + self.pipe = Popen(self._compose_command_args(), stdout=PIPE, + bufsize = 1024, shell = True, stderr = STDOUT, stdin = PIPE) + if self.commandtimeout >= 0: + self.endtime = self.idlequeue.current_time() + self.commandtimeout + self.idlequeue.set_alarm(self.wait_child, 0.1) + + def _start_posix(self): + self.pipe = os.popen(self._compose_command_line()) + self.fd = self.pipe.fileno() + fcntl.fcntl(self.pipe, fcntl.F_SETFL, os.O_NONBLOCK) + self.idlequeue.plug_idle(self, False, True) + if self.commandtimeout >= 0: + self.idlequeue.set_read_timeout(self.fd, self.commandtimeout) + + def end(self): + self.idlequeue.unplug_idle(self.fd) + try: + self.pipe.close() + except: + pass + + def pollend(self): + self.idlequeue.remove_timeout(self.fd) + self.end() + self._return_result() + + def pollin(self): + try: + res = self.pipe.read() + except Exception, e: + res = '' + if res == '': + return self.pollend() + else: + self.result += res + + def read_timeout(self): + self.end() + self._return_result() + +class NsLookup(IdleCommand): + def __init__(self, on_result, host='_xmpp-client', type='srv'): + IdleCommand.__init__(self, on_result) + self.commandtimeout = 10 + self.host = host.lower() + self.type = type.lower() + if not host_pattern.match(self.host): + # invalid host name + print >> sys.stderr, 'Invalid host: %s' % self.host + self.canexecute = False + return + if not ns_type_pattern.match(self.type): + print >> sys.stderr, 'Invalid querytype: %s' % self.type + self.canexecute = False + return + + def _compose_command_args(self): + return ['nslookup', '-type=' + self.type , self.host] + + def _return_result(self): + if self.result_handler: + self.result_handler(self.host, self.type, self.result) + self.result_handler = None + +# below lines is on how to use API and assist in testing +if __name__ == '__main__': + if os.name == 'posix': + idlequeue = IdleQueue() + elif os.name == 'nt': + idlequeue = SelectIdleQueue() + # testing Resolver class + import gobject + import gtk + + resolver = Resolver(idlequeue) + + def clicked(widget): + global resolver + host = text_view.get_text() + def on_result(host, result_array): + print 'Result:\n' + repr(result_array) + resolver.resolve(host, on_result) + win = gtk.Window() + win.set_border_width(6) + text_view = gtk.Entry() + text_view.set_text('_xmpp-client._tcp.jabber.org') + hbox = gtk.HBox() + hbox.set_spacing(3) + but = gtk.Button(' Lookup SRV ') + hbox.pack_start(text_view, 5) + hbox.pack_start(but, 0) + but.connect('clicked', clicked) + win.add(hbox) + win.show_all() + gobject.timeout_add(200, idlequeue.process) + gtk.main() Modified: branches/bosh_support/src/common/xmpp/client_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/client_nb.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/src/common/xmpp/client_nb.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -40,6 +40,7 @@ :param domain: domain - for to: attribute (from account info) :param idlequeue: processing idlequeue :param caller: calling object - it has to implement method _event_dispatcher + which is called from dispatcher instance ''' self.Namespace = protocol.NS_CLIENT self.defaultNamespace = self.Namespace Modified: branches/bosh_support/src/gajim.py =================================================================== --- branches/bosh_support/src/gajim.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/src/gajim.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -260,7 +260,7 @@ from common.xmpp import idlequeue from common.zeroconf import connection_zeroconf -from common import nslookup +from common import resolver from common import proxy65_manager from common import socks5 from common import helpers @@ -3077,7 +3077,7 @@ # gajim.idlequeue.process() each foo miliseconds gajim.idlequeue = GlibIdleQueue() # resolve and keep current record of resolved hosts - gajim.resolver = nslookup.Resolver(gajim.idlequeue) + gajim.resolver = resolver.get_resolver(gajim.idlequeue) gajim.socks5queue = socks5.SocksQueue(gajim.idlequeue, self.handle_event_file_rcv_completed, self.handle_event_file_progress) @@ -3222,6 +3222,11 @@ self.last_ftwindow_update = 0 gobject.timeout_add(100, self.autoconnect) + + # when using libasyncns we need to process resolver in regular intervals + if resolver.USE_LIBASYNCNS: + gobject.timeout_add(200, gajim.resolver.process) + if os.name == 'nt': gobject.timeout_add(200, self.process_connections) else: Added: branches/bosh_support/test/lib/__init__.py =================================================================== --- branches/bosh_support/test/lib/__init__.py (rev 0) +++ branches/bosh_support/test/lib/__init__.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,50 @@ +import sys +import os.path +import getopt + +use_x = True +shortargs = 'hnv:' +longargs = 'help no-x verbose=' +opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) +for o, a in opts: + if o in ('-n', '--no-x'): + use_x = False + +gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') + +# look for modules in the CWD, then gajim/test/lib, then gajim/src, then everywhere else +sys.path.insert(1, gajim_root + '/src') +sys.path.insert(1, gajim_root + '/test/lib') + +# a temporary version of ~/.gajim for testing +configdir = gajim_root + '/test/tmp' + +# define _ for i18n +import __builtin__ +__builtin__._ = lambda x: x + +import os + +def setup_env(): + # wipe config directory + if os.path.isdir(configdir): + import shutil + shutil.rmtree(configdir) + + os.mkdir(configdir) + + import common.configpaths + common.configpaths.gajimpaths.init(configdir) + common.configpaths.gajimpaths.init_profile() + + # for some reason common.gajim needs to be imported before xmpppy? + from common import gajim + + gajim.DATA_DIR = gajim_root + '/data' + gajim.use_x = use_x + + if use_x: + import gtkgui_helpers + gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' + +# vim: se ts=3: Added: branches/bosh_support/test/lib/data.py =================================================================== --- branches/bosh_support/test/lib/data.py (rev 0) +++ branches/bosh_support/test/lib/data.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +account1 = u'acc1' +account2 = u'Cool"chârßéµö' +account3 = u'dingdong.org' + +contacts = {} +contacts[account1] = { + u'myjid@'+account1: { + 'ask': None, 'groups': [], 'name': None, 'resources': {}, + 'subscription': u'both'}, + u'default1(a)gajim.org': { + 'ask': None, 'groups': [], 'name': None, 'resources': {}, + 'subscription': u'both'}, + u'default2(a)gajim.org': { + 'ask': None, 'groups': [u'GroupA',], 'name': None, 'resources': {}, + 'subscription': u'both'}, + u'Cool"chârßéµö(a)gajim.org': { + 'ask': None, 'groups': [u'<Cool"chârßéµö', u'GroupB'], + 'name': None, 'resources': {}, 'subscription': u'both'}, + u'samejid(a)gajim.org': { + 'ask': None, 'groups': [u'GroupA',], 'name': None, 'resources': {}, + 'subscription': u'both'} +} +contacts[account2] = { + u'myjid@'+account2: { + 'ask': None, 'groups': [], 'name': None, 'resources': {}, + 'subscription': u'both'}, + u'default3(a)gajim.org': { + 'ask': None, 'groups': [u'GroupC',], 'name': None, 'resources': {}, + 'subscription': u'both'}, + u'asksubfrom(a)gajim.org': { + 'ask': u'subscribe', 'groups': [u'GroupA',], 'name': None, + 'resources': {}, 'subscription': u'from'}, + u'subto(a)gajim.org': { + 'ask': None, 'groups': [u'GroupB'], 'name': None, 'resources': {}, + 'subscription': u'to'}, + u'samejid(a)gajim.org': { + 'ask': None, 'groups': [u'GroupA', u'GroupB'], 'name': None, + 'resources': {}, 'subscription': u'both'} +} +contacts[account3] = { + #u'guypsych0\\40h.com(a)msn.dingdong.org': { + # 'ask': None, 'groups': [], 'name': None, 'resources': {}, + # 'subscription': u'both'}, + u'guypsych0%h.com(a)msn.delx.cjb.net': { + 'ask': u'subscribe', 'groups': [], 'name': None, + 'resources': {}, 'subscription': u'from'}, + #u'guypsych0%h.com(a)msn.jabber.wiretrip.org': { + # 'ask': None, 'groups': [], 'name': None, 'resources': {}, + # 'subscription': u'to'}, + #u'guypsycho\\40g.com(a)gtalk.dingdong.org': { + # 'ask': None, 'groups': [], 'name': None, + # 'resources': {}, 'subscription': u'both'} +} +# We have contacts that are not in roster but only specified in the metadata +metacontact_data = [ + [{'account': account3, + 'jid': u'guypsych0\\40h.com(a)msn.dingdong.org', + 'order': 0}, + {'account': account3, + 'jid': u'guypsych0%h.com(a)msn.delx.cjb.net', + 'order': 0}, + {'account': account3, + 'jid': u'guypsych0%h.com(a)msn.jabber.wiretrip.org', + 'order': 0}, + {'account': account3, + 'jid': u'guypsycho\\40g.com(a)gtalk.dingdong.org', + 'order': 0}], + + [{'account': account1, + 'jid': u'samejid(a)gajim.org', + 'order': 0}, + {'account': account2, + 'jid': u'samejid(a)gajim.org', + 'order': 0}] + ] + Property changes on: branches/bosh_support/test/lib/data.py ___________________________________________________________________ Added: svn:executable + * Added: branches/bosh_support/test/lib/mock.py =================================================================== --- branches/bosh_support/test/lib/mock.py (rev 0) +++ branches/bosh_support/test/lib/mock.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,467 @@ +# +# (c) Dave Kirby 2001 - 2005 +# mock(a)thedeveloperscoach.com +# +# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) +# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) +# +# This Python module and associated files are released under the FreeBSD +# license. Essentially, you can do what you like with it except pretend you wrote +# it yourself. +# +# +# Copyright (c) 2005, Dave Kirby +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of this library nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# mock(a)thedeveloperscoach.com + + +""" +Mock object library for Python. Mock objects can be used when unit testing +to remove a dependency on another production class. They are typically used +when the dependency would either pull in lots of other classes, or +significantly slow down the execution of the test. +They are also used to create exceptional conditions that cannot otherwise +be easily triggered in the class under test. +""" + +__version__ = "0.1.0" + +# Added in Python 2.1 +import inspect +import re + +class MockInterfaceError(Exception): + pass + +class Mock: + """ + The Mock class emulates any other class for testing purposes. + All method calls are stored for later examination. + """ + + def __init__(self, returnValues=None, realClass=None): + """ + The Mock class constructor takes a dictionary of method names and + the values they return. Methods that are not in the returnValues + dictionary will return None. + You may also supply a class whose interface is being mocked. + All calls will be checked to see if they appear in the original + interface. Any calls to methods not appearing in the real class + will raise a MockInterfaceError. Any calls that would fail due to + non-matching parameter lists will also raise a MockInterfaceError. + Both of these help to prevent the Mock class getting out of sync + with the class it is Mocking. + """ + self.mockCalledMethods = {} + self.mockAllCalledMethods = [] + self.mockReturnValues = returnValues or {} + self.mockExpectations = {} + self.realClassMethods = None + if realClass: + self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) + for retMethod in self.mockReturnValues.keys(): + if not self.realClassMethods.has_key(retMethod): + raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) + self._setupSubclassMethodInterceptors() + + def _setupSubclassMethodInterceptors(self): + methods = inspect.getmembers(self.__class__,inspect.isroutine) + baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) + for m in methods: + name = m[0] + # Don't record calls to methods of Mock base class. + if not name in baseMethods: + self.__dict__[name] = MockCallable(name, self, handcrafted=True) + + def __getattr__(self, name): + return MockCallable(name, self) + + def mockAddReturnValues(self, **methodReturnValues ): + self.mockReturnValues.update(methodReturnValues) + + def mockSetExpectation(self, name, testFn, after=0, until=0): + self.mockExpectations.setdefault(name, []).append((testFn,after,until)) + + def _checkInterfaceCall(self, name, callParams, callKwParams): + """ + Check that a call to a method of the given name to the original + class with the given parameters would not fail. If it would fail, + raise a MockInterfaceError. + Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. + """ + if self.realClassMethods == None: + return + if not self.realClassMethods.has_key(name): + raise MockInterfaceError("Calling mock method '%s' that was not found in the original class" % name) + + func = self.realClassMethods[name] + try: + args, varargs, varkw, defaults = inspect.getargspec(func) + except TypeError: + # func is not a Python function. It is probably a builtin, + # such as __repr__ or __coerce__. TODO: Checking? + # For now assume params are OK. + return + + # callParams doesn't include self; args does include self. + numPosCallParams = 1 + len(callParams) + + if numPosCallParams > len(args) and not varargs: + raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % + (name, len(args), numPosCallParams)) + + # Get the number of positional arguments that appear in the call, + # also check for duplicate parameters and unknown parameters + numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) + + lenArgsNoDefaults = len(args) - len(defaults or []) + if numPosSeen < lenArgsNoDefaults: + raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) + + def mockGetAllCalls(self): + """ + Return a list of MockCall objects, + representing all the methods in the order they were called. + """ + return self.mockAllCalledMethods + getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility + + def mockGetNamedCalls(self, methodName): + """ + Return a list of MockCall objects, + representing all the calls to the named method in the order they were called. + """ + return self.mockCalledMethods.get(methodName, []) + getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility + + def mockCheckCall(self, index, name, *args, **kwargs): + '''test that the index-th call had the specified name and parameters''' + call = self.mockAllCalledMethods[index] + assert name == call.getName(), "%r != %r" % (name, call.getName()) + call.checkArgs(*args, **kwargs) + + +def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): + """ + Positional arguments can appear as call parameters either named as + a named (keyword) parameter, or just as a value to be matched by + position. Count the positional arguments that are given by either + keyword or position, and check for duplicate specifications. + Also check for arguments specified by keyword that do not appear + in the method's parameter list. + """ + posSeen = {} + for arg in args[:numPosCallParams]: + posSeen[arg] = True + for kwp in callKwParams: + if posSeen.has_key(kwp): + raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) + if kwp in args: + posSeen[kwp] = True + elif not varkw: + raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) + return len(posSeen) + +class MockCall: + """ + MockCall records the name and parameters of a call to an instance + of a Mock class. Instances of MockCall are created by the Mock class, + but can be inspected later as part of the test. + """ + def __init__(self, name, params, kwparams ): + self.name = name + self.params = params + self.kwparams = kwparams + + def checkArgs(self, *args, **kwargs): + assert args == self.params, "%r != %r" % (args, self.params) + assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) + + def getParam( self, n ): + if isinstance(n, int): + return self.params[n] + elif isinstance(n, str): + return self.kwparams[n] + else: + raise IndexError, 'illegal index type for getParam' + + def getNumParams(self): + return len(self.params) + + def getNumKwParams(self): + return len(self.kwparams) + + def getName(self): + return self.name + + #pretty-print the method call + def __str__(self): + s = self.name + "(" + sep = '' + for p in self.params: + s = s + sep + repr(p) + sep = ', ' + items = self.kwparams.items() + items.sort() + for k,v in items: + s = s + sep + k + '=' + repr(v) + sep = ', ' + s = s + ')' + return s + def __repr__(self): + return self.__str__() + +class MockCallable: + """ + Intercepts the call and records it, then delegates to either the mock's + dictionary of mock return values that was passed in to the constructor, + or a handcrafted method of a Mock subclass. + """ + def __init__(self, name, mock, handcrafted=False): + self.name = name + self.mock = mock + self.handcrafted = handcrafted + + def __call__(self, *params, **kwparams): + self.mock._checkInterfaceCall(self.name, params, kwparams) + thisCall = self.recordCall(params,kwparams) + self.checkExpectations(thisCall, params, kwparams) + return self.makeCall(params, kwparams) + + def recordCall(self, params, kwparams): + """ + Record the MockCall in an ordered list of all calls, and an ordered + list of calls for that method name. + """ + thisCall = MockCall(self.name, params, kwparams) + calls = self.mock.mockCalledMethods.setdefault(self.name, []) + calls.append(thisCall) + self.mock.mockAllCalledMethods.append(thisCall) + return thisCall + + def makeCall(self, params, kwparams): + if self.handcrafted: + allPosParams = (self.mock,) + params + func = _findFunc(self.mock.__class__, self.name) + if not func: + raise NotImplementedError + return func(*allPosParams, **kwparams) + else: + returnVal = self.mock.mockReturnValues.get(self.name) + if isinstance(returnVal, ReturnValuesBase): + returnVal = returnVal.next() + return returnVal + + def checkExpectations(self, thisCall, params, kwparams): + if self.name in self.mock.mockExpectations: + callsMade = len(self.mock.mockCalledMethods[self.name]) + for (expectation, after, until) in self.mock.mockExpectations[self.name]: + if callsMade > after and (until==0 or callsMade < until): + assert expectation(self.mock, thisCall, len(self.mock.mockAllCalledMethods)-1), 'Expectation failed: '+str(thisCall) + + +def _findFunc(cl, name): + """ Depth first search for a method with a given name. """ + if cl.__dict__.has_key(name): + return cl.__dict__[name] + for base in cl.__bases__: + func = _findFunc(base, name) + if func: + return func + return None + + + +class ReturnValuesBase: + def next(self): + try: + return self.iter.next() + except StopIteration: + raise AssertionError("No more return values") + def __iter__(self): + return self + +class ReturnValues(ReturnValuesBase): + def __init__(self, *values): + self.iter = iter(values) + + +class ReturnIterator(ReturnValuesBase): + def __init__(self, iterator): + self.iter = iter(iterator) + + +def expectParams(*params, **keywords): + '''check that the callObj is called with specified params and keywords + ''' + def fn(mockObj, callObj, idx): + return callObj.params == params and callObj.kwparams == keywords + return fn + + +def expectAfter(*methods): + '''check that the function is only called after all the functions in 'methods' + ''' + def fn(mockObj, callObj, idx): + calledMethods = [method.getName() for method in mockObj.mockGetAllCalls()] + #skip last entry, since that is the current call + calledMethods = calledMethods[:-1] + for method in methods: + if method not in calledMethods: + return False + return True + return fn + +def expectException(exception, *args, **kwargs): + ''' raise an exception when the method is called + ''' + def fn(mockObj, callObj, idx): + raise exception(*args, **kwargs) + return fn + + +def expectParam(paramIdx, cond): + '''check that the callObj is called with parameter specified by paramIdx (a position index or keyword) + fulfills the condition specified by cond. + cond is a function that takes a single argument, the value to test. + ''' + def fn(mockObj, callObj, idx): + param = callObj.getParam(paramIdx) + return cond(param) + return fn + +def EQ(value): + def testFn(param): + return param == value + return testFn + +def NE(value): + def testFn(param): + return param != value + return testFn + +def GT(value): + def testFn(param): + return param > value + return testFn + +def LT(value): + def testFn(param): + return param < value + return testFn + +def GE(value): + def testFn(param): + return param >= value + return testFn + +def LE(value): + def testFn(param): + return param <= value + return testFn + +def AND(*condlist): + def testFn(param): + for cond in condlist: + if not cond(param): + return False + return True + return testFn + +def OR(*condlist): + def testFn(param): + for cond in condlist: + if cond(param): + return True + return False + return testFn + +def NOT(cond): + def testFn(param): + return not cond(param) + return testFn + +def MATCHES(regex, *args, **kwargs): + compiled_regex = re.compile(regex, *args, **kwargs) + def testFn(param): + return compiled_regex.match(param) != None + return testFn + +def SEQ(*sequence): + iterator = iter(sequence) + def testFn(param): + try: + cond = iterator.next() + except StopIteration: + raise AssertionError('SEQ exhausted') + return cond(param) + return testFn + +def IS(instance): + def testFn(param): + return param is instance + return testFn + +def ISINSTANCE(class_): + def testFn(param): + return isinstance(param, class_) + return testFn + +def ISSUBCLASS(class_): + def testFn(param): + return issubclass(param, class_) + return testFn + +def CONTAINS(val): + def testFn(param): + return val in param + return testFn + +def IN(container): + def testFn(param): + return param in container + return testFn + +def HASATTR(attr): + def testFn(param): + return hasattr(param, attr) + return testFn + +def HASMETHOD(method): + def testFn(param): + return hasattr(param, method) and callable(getattr(param, method)) + return testFn + +CALLABLE = callable + + + + +# vim: se ts=3: \ No newline at end of file Added: branches/bosh_support/test/lib/mocks.py =================================================================== --- branches/bosh_support/test/lib/mocks.py (rev 0) +++ branches/bosh_support/test/lib/mocks.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,145 @@ +# gajim-specific mock objects +from mock import Mock + +from common import gajim + +from common.connection_handlers import ConnectionHandlersBase + +class MockConnection(Mock, ConnectionHandlersBase): + def __init__(self, account, *args): + Mock.__init__(self, *args) + ConnectionHandlersBase.__init__(self) + + self.name = account + self.connected = 2 + self.mood = {} + self.activity = {} + self.tune = {} + self.blocked_contacts = {} + self.blocked_groups = {} + self.sessions = {} + + gajim.interface.instances[account] = {'infos': {}, 'disco': {}, + 'gc_config': {}, 'search': {}} + gajim.interface.minimized_controls[account] = {} + gajim.contacts.add_account(account) + gajim.groups[account] = {} + gajim.gc_connected[account] = {} + gajim.automatic_rooms[account] = {} + gajim.newly_added[account] = [] + gajim.to_be_removed[account] = [] + gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name') + gajim.block_signed_in_notifications[account] = True + gajim.sleeper_state[account] = 0 + gajim.encrypted_chats[account] = [] + gajim.last_message_time[account] = {} + gajim.status_before_autoaway[account] = '' + gajim.transport_avatar[account] = {} + gajim.gajim_optional_features[account] = [] + gajim.caps_hash[account] = '' + + gajim.connections[account] = self + +class MockWindow(Mock): + def __init__(self, *args): + Mock.__init__(self, *args) + self.window = Mock() + self._controls = {} + + def get_control(self, jid, account): + try: + return self._controls[account][jid] + except KeyError: + return None + + def has_control(self, jid, acct): + return self.get_control(jid, acct) is not None + + def new_tab(self, ctrl): + account = ctrl.account + jid = ctrl.jid + + if account not in self._controls: + self._controls[account] = {} + + if jid not in self._controls[account]: + self._controls[account][jid] = {} + + self._controls[account][jid] = ctrl + + def __nonzero__(self): + return True + +class MockChatControl(Mock): + def __init__(self, jid, account, *args): + Mock.__init__(self, *args) + + self.jid = jid + self.account = account + + self.parent_win = MockWindow({'get_active_control': self}) + self.session = None + + def set_session(self, sess): + self.session = sess + + def __nonzero__(self): + return True + + def __eq__(self, other): + return self is other + +class MockInterface(Mock): + def __init__(self, *args): + Mock.__init__(self, *args) + gajim.interface = self + self.msg_win_mgr = Mock() + self.roster = Mock() + + self.remote_ctrl = None + self.instances = {} + self.minimized_controls = {} + self.status_sent_to_users = Mock() + + if gajim.use_x: + self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, + 'closed': {}} + + import gtkgui_helpers + gtkgui_helpers.make_jabber_state_images() + else: + self.jabber_state_images = {'16': Mock(), '32': Mock(), + 'opened': Mock(), 'closed': Mock()} + +class MockLogger(Mock): + def __init__(self): + Mock.__init__(self, {'write': None, 'get_transports_type': {}}) + +class MockContact(Mock): + def __nonzero__(self): + return True + +import random + +class MockSession(Mock): + def __init__(self, conn, jid, thread_id, type): + Mock.__init__(self) + + self.conn = conn + self.jid = jid + self.type = type + self.thread_id = thread_id + + if not self.thread_id: + self.thread_id = '%0x' % random.randint(0, 10000) + + def __repr__(self): + return '<MockSession %s>' % self.thread_id + + def __nonzero__(self): + return True + + def __eq__(self, other): + return self is other + +# vim: se ts=3: Added: branches/bosh_support/test/lib/notify.py =================================================================== --- branches/bosh_support/test/lib/notify.py (rev 0) +++ branches/bosh_support/test/lib/notify.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,17 @@ +# mock notify module + +notifications = [] + +def notify(event, jid, account, parameters, advanced_notif_num = None): + notifications.append((event, jid, account, parameters, advanced_notif_num)) + +def get_advanced_notification(event, account, contact): + return None + +def get_show_in_roster(event, account, contact, session = None): + return True + +def get_show_in_systray(event, account, contact, type_ = None): + return True + +# vim: se ts=3: \ No newline at end of file Deleted: branches/bosh_support/test/mock.py =================================================================== --- branches/bosh_support/test/mock.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/test/mock.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -1,465 +0,0 @@ -# -# (c) Dave Kirby 2001 - 2005 -# mock(a)thedeveloperscoach.com -# -# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) -# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) -# -# This Python module and associated files are released under the FreeBSD -# license. Essentially, you can do what you like with it except pretend you wrote -# it yourself. -# -# -# Copyright (c) 2005, Dave Kirby -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of this library nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# mock(a)thedeveloperscoach.com - - -""" -Mock object library for Python. Mock objects can be used when unit testing -to remove a dependency on another production class. They are typically used -when the dependency would either pull in lots of other classes, or -significantly slow down the execution of the test. -They are also used to create exceptional conditions that cannot otherwise -be easily triggered in the class under test. -""" - -__version__ = "0.1.0" - -# Added in Python 2.1 -import inspect -import re - -class MockInterfaceError(Exception): - pass - -class Mock: - """ - The Mock class emulates any other class for testing purposes. - All method calls are stored for later examination. - """ - - def __init__(self, returnValues=None, realClass=None): - """ - The Mock class constructor takes a dictionary of method names and - the values they return. Methods that are not in the returnValues - dictionary will return None. - You may also supply a class whose interface is being mocked. - All calls will be checked to see if they appear in the original - interface. Any calls to methods not appearing in the real class - will raise a MockInterfaceError. Any calls that would fail due to - non-matching parameter lists will also raise a MockInterfaceError. - Both of these help to prevent the Mock class getting out of sync - with the class it is Mocking. - """ - self.mockCalledMethods = {} - self.mockAllCalledMethods = [] - self.mockReturnValues = returnValues or {} - self.mockExpectations = {} - self.realClassMethods = None - if realClass: - self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) - for retMethod in self.mockReturnValues.keys(): - if not self.realClassMethods.has_key(retMethod): - raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) - self._setupSubclassMethodInterceptors() - - def _setupSubclassMethodInterceptors(self): - methods = inspect.getmembers(self.__class__,inspect.isroutine) - baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) - for m in methods: - name = m[0] - # Don't record calls to methods of Mock base class. - if not name in baseMethods: - self.__dict__[name] = MockCallable(name, self, handcrafted=True) - - def __getattr__(self, name): - return MockCallable(name, self) - - def mockAddReturnValues(self, **methodReturnValues ): - self.mockReturnValues.update(methodReturnValues) - - def mockSetExpectation(self, name, testFn, after=0, until=0): - self.mockExpectations.setdefault(name, []).append((testFn,after,until)) - - def _checkInterfaceCall(self, name, callParams, callKwParams): - """ - Check that a call to a method of the given name to the original - class with the given parameters would not fail. If it would fail, - raise a MockInterfaceError. - Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. - """ - if self.realClassMethods == None: - return - if not self.realClassMethods.has_key(name): - raise MockInterfaceError("Calling mock method '%s' that was not found in the original class" % name) - - func = self.realClassMethods[name] - try: - args, varargs, varkw, defaults = inspect.getargspec(func) - except TypeError: - # func is not a Python function. It is probably a builtin, - # such as __repr__ or __coerce__. TODO: Checking? - # For now assume params are OK. - return - - # callParams doesn't include self; args does include self. - numPosCallParams = 1 + len(callParams) - - if numPosCallParams > len(args) and not varargs: - raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % - (name, len(args), numPosCallParams)) - - # Get the number of positional arguments that appear in the call, - # also check for duplicate parameters and unknown parameters - numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) - - lenArgsNoDefaults = len(args) - len(defaults or []) - if numPosSeen < lenArgsNoDefaults: - raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) - - def mockGetAllCalls(self): - """ - Return a list of MockCall objects, - representing all the methods in the order they were called. - """ - return self.mockAllCalledMethods - getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility - - def mockGetNamedCalls(self, methodName): - """ - Return a list of MockCall objects, - representing all the calls to the named method in the order they were called. - """ - return self.mockCalledMethods.get(methodName, []) - getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility - - def mockCheckCall(self, index, name, *args, **kwargs): - '''test that the index-th call had the specified name and parameters''' - call = self.mockAllCalledMethods[index] - assert name == call.getName(), "%r != %r" % (name, call.getName()) - call.checkArgs(*args, **kwargs) - - -def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): - """ - Positional arguments can appear as call parameters either named as - a named (keyword) parameter, or just as a value to be matched by - position. Count the positional arguments that are given by either - keyword or position, and check for duplicate specifications. - Also check for arguments specified by keyword that do not appear - in the method's parameter list. - """ - posSeen = {} - for arg in args[:numPosCallParams]: - posSeen[arg] = True - for kwp in callKwParams: - if posSeen.has_key(kwp): - raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) - if kwp in args: - posSeen[kwp] = True - elif not varkw: - raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) - return len(posSeen) - -class MockCall: - """ - MockCall records the name and parameters of a call to an instance - of a Mock class. Instances of MockCall are created by the Mock class, - but can be inspected later as part of the test. - """ - def __init__(self, name, params, kwparams ): - self.name = name - self.params = params - self.kwparams = kwparams - - def checkArgs(self, *args, **kwargs): - assert args == self.params, "%r != %r" % (args, self.params) - assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) - - def getParam( self, n ): - if isinstance(n, int): - return self.params[n] - elif isinstance(n, str): - return self.kwparams[n] - else: - raise IndexError, 'illegal index type for getParam' - - def getNumParams(self): - return len(self.params) - - def getNumKwParams(self): - return len(self.kwparams) - - def getName(self): - return self.name - - #pretty-print the method call - def __str__(self): - s = self.name + "(" - sep = '' - for p in self.params: - s = s + sep + repr(p) - sep = ', ' - items = self.kwparams.items() - items.sort() - for k,v in items: - s = s + sep + k + '=' + repr(v) - sep = ', ' - s = s + ')' - return s - def __repr__(self): - return self.__str__() - -class MockCallable: - """ - Intercepts the call and records it, then delegates to either the mock's - dictionary of mock return values that was passed in to the constructor, - or a handcrafted method of a Mock subclass. - """ - def __init__(self, name, mock, handcrafted=False): - self.name = name - self.mock = mock - self.handcrafted = handcrafted - - def __call__(self, *params, **kwparams): - self.mock._checkInterfaceCall(self.name, params, kwparams) - thisCall = self.recordCall(params,kwparams) - self.checkExpectations(thisCall, params, kwparams) - return self.makeCall(params, kwparams) - - def recordCall(self, params, kwparams): - """ - Record the MockCall in an ordered list of all calls, and an ordered - list of calls for that method name. - """ - thisCall = MockCall(self.name, params, kwparams) - calls = self.mock.mockCalledMethods.setdefault(self.name, []) - calls.append(thisCall) - self.mock.mockAllCalledMethods.append(thisCall) - return thisCall - - def makeCall(self, params, kwparams): - if self.handcrafted: - allPosParams = (self.mock,) + params - func = _findFunc(self.mock.__class__, self.name) - if not func: - raise NotImplementedError - return func(*allPosParams, **kwparams) - else: - returnVal = self.mock.mockReturnValues.get(self.name) - if isinstance(returnVal, ReturnValuesBase): - returnVal = returnVal.next() - return returnVal - - def checkExpectations(self, thisCall, params, kwparams): - if self.name in self.mock.mockExpectations: - callsMade = len(self.mock.mockCalledMethods[self.name]) - for (expectation, after, until) in self.mock.mockExpectations[self.name]: - if callsMade > after and (until==0 or callsMade < until): - assert expectation(self.mock, thisCall, len(self.mock.mockAllCalledMethods)-1), 'Expectation failed: '+str(thisCall) - - -def _findFunc(cl, name): - """ Depth first search for a method with a given name. """ - if cl.__dict__.has_key(name): - return cl.__dict__[name] - for base in cl.__bases__: - func = _findFunc(base, name) - if func: - return func - return None - - - -class ReturnValuesBase: - def next(self): - try: - return self.iter.next() - except StopIteration: - raise AssertionError("No more return values") - def __iter__(self): - return self - -class ReturnValues(ReturnValuesBase): - def __init__(self, *values): - self.iter = iter(values) - - -class ReturnIterator(ReturnValuesBase): - def __init__(self, iterator): - self.iter = iter(iterator) - - -def expectParams(*params, **keywords): - '''check that the callObj is called with specified params and keywords - ''' - def fn(mockObj, callObj, idx): - return callObj.params == params and callObj.kwparams == keywords - return fn - - -def expectAfter(*methods): - '''check that the function is only called after all the functions in 'methods' - ''' - def fn(mockObj, callObj, idx): - calledMethods = [method.getName() for method in mockObj.mockGetAllCalls()] - #skip last entry, since that is the current call - calledMethods = calledMethods[:-1] - for method in methods: - if method not in calledMethods: - return False - return True - return fn - -def expectException(exception, *args, **kwargs): - ''' raise an exception when the method is called - ''' - def fn(mockObj, callObj, idx): - raise exception(*args, **kwargs) - return fn - - -def expectParam(paramIdx, cond): - '''check that the callObj is called with parameter specified by paramIdx (a position index or keyword) - fulfills the condition specified by cond. - cond is a function that takes a single argument, the value to test. - ''' - def fn(mockObj, callObj, idx): - param = callObj.getParam(paramIdx) - return cond(param) - return fn - -def EQ(value): - def testFn(param): - return param == value - return testFn - -def NE(value): - def testFn(param): - return param != value - return testFn - -def GT(value): - def testFn(param): - return param > value - return testFn - -def LT(value): - def testFn(param): - return param < value - return testFn - -def GE(value): - def testFn(param): - return param >= value - return testFn - -def LE(value): - def testFn(param): - return param <= value - return testFn - -def AND(*condlist): - def testFn(param): - for cond in condlist: - if not cond(param): - return False - return True - return testFn - -def OR(*condlist): - def testFn(param): - for cond in condlist: - if cond(param): - return True - return False - return testFn - -def NOT(cond): - def testFn(param): - return not cond(param) - return testFn - -def MATCHES(regex, *args, **kwargs): - compiled_regex = re.compile(regex, *args, **kwargs) - def testFn(param): - return compiled_regex.match(param) != None - return testFn - -def SEQ(*sequence): - iterator = iter(sequence) - def testFn(param): - try: - cond = iterator.next() - except StopIteration: - raise AssertionError('SEQ exhausted') - return cond(param) - return testFn - -def IS(instance): - def testFn(param): - return param is instance - return testFn - -def ISINSTANCE(class_): - def testFn(param): - return isinstance(param, class_) - return testFn - -def ISSUBCLASS(class_): - def testFn(param): - return issubclass(param, class_) - return testFn - -def CONTAINS(val): - def testFn(param): - return val in param - return testFn - -def IN(container): - def testFn(param): - return param in container - return testFn - -def HASATTR(attr): - def testFn(param): - return hasattr(param, attr) - return testFn - -def HASMETHOD(method): - def testFn(param): - return hasattr(param, method) and callable(getattr(param, method)) - return testFn - -CALLABLE = callable - - - Deleted: branches/bosh_support/test/mocks.py =================================================================== --- branches/bosh_support/test/mocks.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/test/mocks.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -1,68 +0,0 @@ -# gajim-specific mock objects -from mock import Mock - -from common import gajim - -class MockConnection(Mock): - def __init__(self, name, *args): - Mock.__init__(self, *args) - self.name = name - gajim.connections[name] = self - -class MockWindow(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - self.window = Mock() - -class MockChatControl(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - - self.parent_win = MockWindow({'get_active_control': self}) - self.session = None - - def set_session(self, sess): - self.session = sess - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other - -class MockInterface(Mock): - def __init__(self, acct, *args): - Mock.__init__(self, *args) - self.msg_win_mgr = Mock() - self.roster = Mock() - - self.remote_ctrl = None - self.minimized_controls = { acct: {} } - -class MockLogger(Mock): - def __init__(self): - Mock.__init__(self, {'write': None}) - -class MockContact(Mock): - def __nonzero__(self): - return True - -import random - -class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type): - Mock.__init__(self) - - self.conn = conn - self.jid = jid - self.type = type - self.thread_id = thread_id - - if not self.thread_id: - self.thread_id = '%0x' % random.randint(0, 10000) - - def __repr__(self): - print '<MockSession %s>' % self.thread_id - - def __nonzero__(self): - return True Deleted: branches/bosh_support/test/notify.py =================================================================== --- branches/bosh_support/test/notify.py 2008-08-31 23:04:36 UTC (rev 10370) +++ branches/bosh_support/test/notify.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -1,15 +0,0 @@ -# mock notify module - -notifications = [] - -def notify(event, jid, account, parameters, advanced_notif_num = None): - notifications.append((event, jid, account, parameters, advanced_notif_num)) - -def get_advanced_notification(event, account, contact): - return None - -def get_show_in_roster(event, account, contact, session = None): - return True - -def get_show_in_systray(event, account, contact, type_ = None): - return True Added: branches/bosh_support/test/test_resolver.py =================================================================== --- branches/bosh_support/test/test_resolver.py (rev 0) +++ branches/bosh_support/test/test_resolver.py 2008-08-31 23:40:06 UTC (rev 10371) @@ -0,0 +1,95 @@ +import unittest + +import time + +import lib +lib.setup_env() + +from common import resolver +from gajim import GlibIdleQueue + +from mock import Mock, expectParams +from mocks import * + +import gtk + + +GMAIL_SRV_NAME = '_xmpp-client._tcp.gmail.com' +NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' +JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' +JABBERCZ_SRV_NAME = '_xmpp-client._tcp.jabber.cz' + +TEST_LIST = [(GMAIL_SRV_NAME, 'srv', True), + (NONSENSE_NAME, 'srv', False), + (JABBERCZ_SRV_NAME, 'srv', True)] + +class TestResolver(unittest.TestCase): + def setUp(self): + self.iq = GlibIdleQueue() + self.reset() + self.resolver = None + + def reset(self): + self.flag = False + self.expect_results = False + self.nslookup = False + self.resolver = None + + def testLibAsyncNSResolver(self): + self.reset() + if not resolver.USE_LIBASYNCNS: + print 'testLibAsyncResolver: libasyncns-python not installed' + return + self.resolver = resolver.LibAsyncNSResolver() + + for name, type, expect_results in TEST_LIST: + self.expect_results = expect_results + self.runLANSR(name, type) + self.flag = False + + def runLANSR(self, name, type): + self.resolver.resolve( + host = name, + type = type, + on_ready = self.myonready) + while not self.flag: + time.sleep(1) + self.resolver.process() + + + def myonready(self, name, result_set): + print 'on_ready called ...' + print 'hostname: %s' % name + print 'result set: %s' % result_set + print 'res.resolved_hosts: %s' % self.resolver.resolved_hosts + if self.expect_results: + self.assert_(len(result_set) > 0) + else: + self.assert_(result_set == []) + self.flag = True + if self.nslookup: self._testNSLR() + + + def testNSLookupResolver(self): + self.reset() + self.nslookup = True + self.resolver = resolver.NSLookupResolver(self.iq) + self.test_list = TEST_LIST + self._testNSLR() + try: + gtk.main() + except KeyboardInterrupt: + print 'KeyboardInterrupt caught' + + def _testNSLR(self): + if self.test_list == []: + gtk.main_quit() + return + name, type, self.expect_results = self.test_list.pop() + self.resolver.resolve( + host = name, + type = type, + on_ready = self.myonready) + +if __name__ == '__main__': + unittest.main()

1 0

[commit-gajim] r10370 - trunk/src
by bct＠gajim.org 31 Aug '08

31 Aug '08

Author: bct Date: 2008-09-01 01:04:36 +0200 (Mon, 01 Sep 2008) New Revision: 10370 Modified: trunk/src/roster_window.py Log: oops, rdlp already fixed it. fix my screwed up commit Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-31 23:03:10 UTC (rev 10369) +++ trunk/src/roster_window.py 2008-08-31 23:04:36 UTC (rev 10370) @@ -2707,10 +2707,6 @@ else: gajim.connections[account].unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) - dialogs.ConfirmationDialogCheck(_('Remove Group'), - _('Do you want to remove group %s from the roster?' % group), - _('Remove also all contacts in this group from your roster'), - on_response_ok=on_ok) dialogs.ConfirmationDialogCheck(_('Remove Group'), _('Do you want to remove group %s from the roster?' % group),

1 0

[commit-gajim] r10369 - trunk/src
by bct＠gajim.org 31 Aug '08

31 Aug '08

Author: bct Date: 2008-09-01 01:03:10 +0200 (Mon, 01 Sep 2008) New Revision: 10369 Modified: trunk/src/roster_window.py Log: fix #4275, minor grammar fix Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-31 23:02:22 UTC (rev 10368) +++ trunk/src/roster_window.py 2008-08-31 23:03:10 UTC (rev 10369) @@ -2712,6 +2712,11 @@ _('Remove also all contacts in this group from your roster'), on_response_ok=on_ok) + dialogs.ConfirmationDialogCheck(_('Remove Group'), + _('Do you want to remove group %s from the roster?' % group), + _('Also remove all contacts in this group from your roster'), + on_response_ok=on_ok) + def on_assign_pgp_key(self, widget, contact, account): attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split()

1 0

[commit-gajim] r10368 - trunk/src
by roidelapluie＠gajim.org 31 Aug '08

31 Aug '08

Author: roidelapluie Date: 2008-09-01 01:02:22 +0200 (Mon, 01 Sep 2008) New Revision: 10368 Modified: trunk/src/roster_window.py Log: Prevent a tb when trying to remove a group. Fix #4275. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-31 19:40:45 UTC (rev 10367) +++ trunk/src/roster_window.py 2008-08-31 23:02:22 UTC (rev 10368) @@ -2700,10 +2700,6 @@ on_canceled) def on_remove_group_item_activated(self, widget, group, account): - dialogs.ConfirmationDialogCheck(_('Remove Group'), - _('Do you want to remove group %s from the roster?' % group), - _('Remove also all contacts in this group from your roster'), - on_response_ok=on_ok) def on_ok(checked): for contact in gajim.contacts.get_contacts_from_group(account, group): if not checked: @@ -2711,6 +2707,10 @@ else: gajim.connections[account].unsubscribe(contact.jid) self.remove_contact(contact.jid, account, backend=True) + dialogs.ConfirmationDialogCheck(_('Remove Group'), + _('Do you want to remove group %s from the roster?' % group), + _('Remove also all contacts in this group from your roster'), + on_response_ok=on_ok) def on_assign_pgp_key(self, widget, contact, account): attached_keys = gajim.config.get_per('accounts', account,

1 0

[commit-gajim] r10367 - trunk/src/common
by asterix＠gajim.org 31 Aug '08

31 Aug '08

Author: asterix Date: 2008-08-31 21:40:45 +0200 (Sun, 31 Aug 2008) New Revision: 10367 Modified: trunk/src/common/nslookup.py Log: correctly parse nslookup result. fixes #4194 Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-08-31 14:14:00 UTC (rev 10366) +++ trunk/src/common/nslookup.py 2008-08-31 19:40:45 UTC (rev 10367) @@ -119,7 +119,8 @@ domain = None if line.startswith(fqdn): domain = fqdn - elif line.startswith(ufqdn): + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) domain = ufqdn if domain: rest = line[len(domain):].split('=')

1 0

[commit-gajim] r10366 - trunk/src/common
by roidelapluie＠gajim.org 31 Aug '08

31 Aug '08

Author: roidelapluie Date: 2008-08-31 16:14:00 +0200 (Sun, 31 Aug 2008) New Revision: 10366 Modified: trunk/src/common/pep.py Log: remove unsed tupples Modified: trunk/src/common/pep.py =================================================================== --- trunk/src/common/pep.py 2008-08-31 13:40:53 UTC (rev 10365) +++ trunk/src/common/pep.py 2008-08-31 14:14:00 UTC (rev 10366) @@ -492,9 +492,6 @@ def delete_pep(jid, name): (user, resource) = gajim.get_room_and_nick_from_fjid(jid) - activities_keys = ('activity', 'subactivity', 'text') - tune_keys = ('artist', 'title', 'source', 'track', 'length') - mood_keys = ('mood', 'text') if jid == gajim.get_jid_from_account(name): acc = gajim.connections[name]

1 0

[commit-gajim] r10365 - trunk/src/common
by asterix＠gajim.org 31 Aug '08

31 Aug '08

Author: asterix Date: 2008-08-31 15:40:53 +0200 (Sun, 31 Aug 2008) New Revision: 10365 Modified: trunk/src/common/connection.py Log: revoke tune when disconnecting only for current account. fixes #4267 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-08-31 12:36:40 UTC (rev 10364) +++ trunk/src/common/connection.py 2008-08-31 13:40:53 UTC (rev 10365) @@ -206,7 +206,7 @@ # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): - gajim.interface.roster.music_track_changed(None, None) + gajim.interface.roster.music_track_changed(None, None, self.name) self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None

1 0

[commit-gajim] r10364 - trunk/src
by steve-e＠gajim.org 31 Aug '08

31 Aug '08

Author: steve-e Date: 2008-08-31 14:36:40 +0200 (Sun, 31 Aug 2008) New Revision: 10364 Modified: trunk/src/roster_window.py Log: Only remove pep when a contact really signs out. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-31 12:24:45 UTC (rev 10363) +++ trunk/src/roster_window.py 2008-08-31 12:36:40 UTC (rev 10364) @@ -976,10 +976,9 @@ and 'mood' in gajim.connections[account].mood \ and gajim.connections[account].mood['mood'].strip() in MOODS: - self.model[child_iter][C_MOOD_PIXBUF] = \ - gtkgui_helpers.load_mood_icon( - gajim.connections[account].mood['mood']. \ - strip()).get_pixbuf() + self.model[child_iter][C_MOOD_PIXBUF] = gtkgui_helpers.load_mood_icon( + gajim.connections[account].mood['mood'].strip()).get_pixbuf() + elif gajim.config.get('show_mood_in_roster') \ and gajim.connections[account].mood.has_key('mood'): self.model[child_iter][C_MOOD_PIXBUF] = \ @@ -1089,12 +1088,6 @@ if strike: name = '<span strikethrough="true">%s</span>' % name - # Delete pep if needed - keep_pep = any(c.show not in ('error', 'offline') for c in - contact_instances) - if not keep_pep and not contact.is_groupchat(): - pep.delete_pep(jid, account) - # Show resource counter nb_connected_contact = 0 for c in contact_instances: @@ -1994,6 +1987,7 @@ contact.status = status # name is to show in conversation window name = contact.get_shown_name() + fjid = contact.get_full_jid() # The contact has several resources if len(contact_instances) > 1: @@ -2002,10 +1996,8 @@ # Remove resource when going offline if show in ('offline', 'error') and \ - len(gajim.events.get_events(account, contact.get_full_jid())) == 0: - fjid = contact.jid + '/' + contact.resource - ctrl = gajim.interface.msg_win_mgr.get_control( - fjid, account) + len(gajim.events.get_events(account, fjid)) == 0: + ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account) if ctrl: ctrl.update_ui() ctrl.parent_win.redraw_tab(ctrl) @@ -2029,9 +2021,7 @@ account, contact.jid) ctrl.update_status_display(name, uf_show, status) - if contact.resource != '': - fjid = contact.jid + '/' + contact.resource - + if contact.resource: ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account) if ctrl: ctrl.update_status_display(name, uf_show, status) @@ -2041,6 +2031,12 @@ contact.jid in gajim.interface.status_sent_to_users[account]: del gajim.interface.status_sent_to_users[account][contact.jid] + # Delete pep if needed + keep_pep = any(c.show not in ('error', 'offline') for c in + contact_instances) + if not keep_pep and not contact.is_groupchat(): + pep.delete_pep(contact.jid, account) + # Redraw everything and select the sender self.draw_completely_and_show_if_needed(contact.jid, account) @@ -2062,11 +2058,11 @@ # No need to redraw contacts if we're quitting if child_iterA: self.model[child_iterA][C_AVATAR_PIXBUF] = None - if gajim.con_types.has_key(account): + if account in gajim.con_types: gajim.con_types[account] = None for jid in gajim.contacts.get_jid_list(account): lcontact = gajim.contacts.get_contacts(account, jid) - for contact in [c for c in lcontact if (c.show != 'offline' or \ + for contact in [c for c in lcontact if (c.show != 'offline' or c.is_transport())]: self.chg_contact_status(contact, 'offline', '', account) self.actions_menu_needs_rebuild = True

1 0

[commit-gajim] r10363 - trunk/src/common
by asterix＠gajim.org 31 Aug '08

31 Aug '08

Author: asterix Date: 2008-08-31 14:24:45 +0200 (Sun, 31 Aug 2008) New Revision: 10363 Modified: trunk/src/common/nslookup.py Log: revert [10361]: doesn't work in a non-utf-8 environment Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-08-31 12:09:13 UTC (rev 10362) +++ trunk/src/common/nslookup.py 2008-08-31 12:24:45 UTC (rev 10363) @@ -192,7 +192,7 @@ # if it is True, we can safetely execute the command self.canexecute = True self.idlequeue = None - self.result = u'' + self.result = '' def set_idlequeue(self, idlequeue): self.idlequeue = idlequeue

1 0

[commit-gajim] r10362 - trunk/src
by asterix＠gajim.org 31 Aug '08

31 Aug '08

Author: asterix Date: 2008-08-31 14:09:13 +0200 (Sun, 31 Aug 2008) New Revision: 10362 Modified: trunk/src/chat_control.py Log: affect variable before using it. Fixes #4264 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-31 11:53:54 UTC (rev 10361) +++ trunk/src/chat_control.py 2008-08-31 12:09:13 UTC (rev 10362) @@ -1516,6 +1516,7 @@ # Disable encryption ec.remove(self.contact.jid) self.gpg_is_active = False + loggable = False msg = _('GPG encryption disabled') ChatControlBase.print_conversation_line(self, msg, 'status', '', None)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008