Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10161 - in trunk/test: . lib
by bct＠gajim.org 09 Aug '08

09 Aug '08

Author: bct Date: 2008-08-09 02:24:08 +0200 (Sat, 09 Aug 2008) New Revision: 10161 Added: trunk/test/lib/ trunk/test/lib/__init__.py trunk/test/lib/data.py trunk/test/lib/mock.py trunk/test/lib/mocks.py trunk/test/lib/notify.py Removed: trunk/test/data.py trunk/test/mock.py trunk/test/mocks.py trunk/test/notify.py trunk/test/testlib.py Modified: trunk/test/test_caps.py trunk/test/test_dispatcher_nb.py trunk/test/test_misc_interface.py trunk/test/test_roster.py trunk/test/test_sessions.py Log: moved testing libraries into their own directory Deleted: trunk/test/data.py =================================================================== --- trunk/test/data.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/data.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -account1 = u'acc1' -account2 = u'Cool"chârßéµö' - -contacts = {} -contacts[account1] = { - 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'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'} -} - -# vim: se ts=3: Copied: trunk/test/lib/__init__.py (from rev 10160, trunk/test/testlib.py) =================================================================== --- trunk/test/lib/__init__.py (rev 0) +++ trunk/test/lib/__init__.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -0,0 +1,39 @@ +import sys +import os.path + +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' + + import gtkgui_helpers + gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' + +# vim: se ts=3: Copied: trunk/test/lib/data.py (from rev 10160, trunk/test/data.py) =================================================================== --- trunk/test/lib/data.py (rev 0) +++ trunk/test/lib/data.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +account1 = u'acc1' +account2 = u'Cool"chârßéµö' + +contacts = {} +contacts[account1] = { + 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'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'} +} + +# vim: se ts=3: Copied: trunk/test/lib/mock.py (from rev 10160, trunk/test/mock.py) =================================================================== --- trunk/test/lib/mock.py (rev 0) +++ trunk/test/lib/mock.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -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 Copied: trunk/test/lib/mocks.py (from rev 10160, trunk/test/mocks.py) =================================================================== --- trunk/test/lib/mocks.py (rev 0) +++ trunk/test/lib/mocks.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -0,0 +1,98 @@ +# gajim-specific mock objects +from mock import Mock + +from common import gajim + +class MockConnection(Mock): + def __init__(self, account, *args): + Mock.__init__(self, *args) + self.name = account + self.connected = 2 + self.mood = {} + self.activity = {} + self.tune = {} + self.blocked_contacts = {} + self.blocked_groups = {} + 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() + +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, *args): + Mock.__init__(self, *args) + self.msg_win_mgr = Mock() + self.roster = Mock() + + self.remote_ctrl = None + self.instances = {} + self.minimized_controls = {} + self.status_sent_to_users = Mock() + + 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): + print '<MockSession %s>' % self.thread_id + + def __nonzero__(self): + return True + +# vim: se ts=3: Copied: trunk/test/lib/notify.py (from rev 10160, trunk/test/notify.py) =================================================================== --- trunk/test/lib/notify.py (rev 0) +++ trunk/test/lib/notify.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -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: trunk/test/mock.py =================================================================== --- trunk/test/mock.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/mock.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,467 +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 - - - - -# vim: se ts=3: \ No newline at end of file Deleted: trunk/test/mocks.py =================================================================== --- trunk/test/mocks.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/mocks.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,98 +0,0 @@ -# gajim-specific mock objects -from mock import Mock - -from common import gajim - -class MockConnection(Mock): - def __init__(self, account, *args): - Mock.__init__(self, *args) - self.name = account - self.connected = 2 - self.mood = {} - self.activity = {} - self.tune = {} - self.blocked_contacts = {} - self.blocked_groups = {} - 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() - -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, *args): - Mock.__init__(self, *args) - self.msg_win_mgr = Mock() - self.roster = Mock() - - self.remote_ctrl = None - self.instances = {} - self.minimized_controls = {} - self.status_sent_to_users = Mock() - - 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): - print '<MockSession %s>' % self.thread_id - - def __nonzero__(self): - return True - -# vim: se ts=3: Deleted: trunk/test/notify.py =================================================================== --- trunk/test/notify.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/notify.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,17 +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 - -# vim: se ts=3: \ No newline at end of file Modified: trunk/test/test_caps.py =================================================================== --- trunk/test/test_caps.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/test_caps.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,8 +1,8 @@ # tests for capabilities and the capabilities cache import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from common import xmpp @@ -46,4 +46,4 @@ if __name__ == '__main__': unittest.main() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/test/test_dispatcher_nb.py =================================================================== --- trunk/test/test_dispatcher_nb.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/test_dispatcher_nb.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,8 +1,8 @@ # tests for xmpppy's dispatcher_nb.py import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from mock import Mock @@ -52,4 +52,4 @@ if __name__ == '__main__': unittest.main() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/test/test_misc_interface.py =================================================================== --- trunk/test/test_misc_interface.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/test_misc_interface.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,8 +1,8 @@ # tests for the miscellaneous functions scattered throughout src/gajim.py import unittest -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from gajim import Interface Modified: trunk/test/test_roster.py =================================================================== --- trunk/test/test_roster.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/test_roster.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -2,8 +2,8 @@ import time -import testlib -testlib.setup_env() +import lib +lib.setup_env() from data import * Modified: trunk/test/test_sessions.py =================================================================== --- trunk/test/test_sessions.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/test_sessions.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -2,8 +2,8 @@ import time -import testlib -testlib.setup_env() +import lib +lib.setup_env() from common import gajim from common import xmpp Deleted: trunk/test/testlib.py =================================================================== --- trunk/test/testlib.py 2008-08-08 23:53:44 UTC (rev 10160) +++ trunk/test/testlib.py 2008-08-09 00:24:08 UTC (rev 10161) @@ -1,38 +0,0 @@ -import sys -import os.path - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') - -# look for modules in the CWD, then gajim/src, then everywhere else -sys.path.insert(1, gajim_root + '/src') - -# 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' - - import gtkgui_helpers - gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' - -# vim: se ts=3:

1 0

[commit-gajim] r10160 - trunk/test
by bct＠gajim.org 08 Aug '08

08 Aug '08

Author: bct Date: 2008-08-09 01:53:44 +0200 (Sat, 09 Aug 2008) New Revision: 10160 Added: trunk/test/runtests.py Modified: trunk/test/mocks.py trunk/test/test_misc_interface.py trunk/test/test_roster.py trunk/test/testlib.py Log: a script for running all the tests Modified: trunk/test/mocks.py =================================================================== --- trunk/test/mocks.py 2008-08-08 22:55:12 UTC (rev 10159) +++ trunk/test/mocks.py 2008-08-08 23:53:44 UTC (rev 10160) @@ -69,7 +69,7 @@ class MockLogger(Mock): def __init__(self): - Mock.__init__(self, {'write': None}) + Mock.__init__(self, {'write': None, 'get_transports_type': {}}) class MockContact(Mock): def __nonzero__(self): Added: trunk/test/runtests.py =================================================================== --- trunk/test/runtests.py (rev 0) +++ trunk/test/runtests.py 2008-08-08 23:53:44 UTC (rev 10160) @@ -0,0 +1,16 @@ +#!/usr/bin/env python + +import unittest + +# new test modules need to be added manually +modules = ( 'test_caps', + 'test_dispatcher_nb', + 'test_misc_interface', + 'test_roster', + 'test_sessions', + ) +for mod in modules: + suite = unittest.defaultTestLoader.loadTestsFromName(mod) + unittest.TextTestRunner(verbosity=1).run(suite) + +# vim: se ts=3: Property changes on: trunk/test/runtests.py ___________________________________________________________________ Added: svn:executable + * Modified: trunk/test/test_misc_interface.py =================================================================== --- trunk/test/test_misc_interface.py 2008-08-08 22:55:12 UTC (rev 10159) +++ trunk/test/test_misc_interface.py 2008-08-08 23:53:44 UTC (rev 10160) @@ -5,15 +5,10 @@ testlib.setup_env() from common import gajim -from common import xmpp - -from common.caps import CapsCache - -from mock import Mock - from gajim import Interface -gajim.logger = Mock() +from mocks import MockLogger +gajim.logger = MockLogger() Interface() Modified: trunk/test/test_roster.py =================================================================== --- trunk/test/test_roster.py 2008-08-08 22:55:12 UTC (rev 10159) +++ trunk/test/test_roster.py 2008-08-08 23:53:44 UTC (rev 10160) @@ -21,7 +21,7 @@ def setUp(self): gajim.interface = MockInterface() self.roster = roster_window.RosterWindow() - + # Please unuglify :-) self.C_NAME = roster_window.C_NAME self.C_TYPE = roster_window.C_TYPE @@ -52,7 +52,7 @@ self.assertTrue(len(iters) == len(contact.get_shown_groups()), msg='Contact is not in all his groups') - # check for each group tag + # check for each group tag for titerC in iters: self.assertTrue(self.roster.model.iter_is_valid(titerC), msg='Contact iter invalid') @@ -67,7 +67,7 @@ self.assertEquals(account, c_model[self.C_ACCOUNT], msg='Account missmatch') # TODO: Is our parent correct? (group or big b) - + def assert_group_is_in_roster(self, group, account): #TODO pass @@ -80,7 +80,7 @@ acc_model = self.roster.model[titerA] self.assertEquals(acc_model[self.C_TYPE], 'account', msg='No account found') - + if not self.roster.regroup: self.assertEquals(acc_model[self.C_ACCOUNT], acc, msg='Account not found') @@ -88,7 +88,7 @@ self_jid = gajim.get_jid_from_account(acc) self.assertEquals(acc_model[self.C_JID], self_jid, msg='Account JID not found in account row') - + def assert_model_is_in_sync(self): #TODO: check that iter_n_children returns the correct numbers pass @@ -97,18 +97,18 @@ def test_fill_contacts_and_groups_dicts(self): for acc in contacts: self.roster.fill_contacts_and_groups_dicts(contacts[acc], acc) - + for jid in contacts[acc]: instances = gajim.contacts.get_contacts(acc, jid) # Created a contact for each single jid? self.assertTrue(len(instances) == 1) - + # Contacts kept their info contact = instances[0] self.assertEquals(contact.groups, contacts[acc][jid]['groups'], msg='Group Missmatch') - + groups = contacts[acc][jid]['groups'] or ['General',] # cleanup @@ -123,9 +123,9 @@ self.roster.add_account(acc) self.assert_account_is_in_roster(acc) - self.roster.add_account_contacts(acc) + self.roster.add_account_contacts(acc) self.assert_all_contacts_are_in_roster(acc) - + self.assert_model_is_in_sync() @@ -166,6 +166,6 @@ if __name__ == '__main__': - unittest.main() + unittest.main() # vim: se ts=3: Modified: trunk/test/testlib.py =================================================================== --- trunk/test/testlib.py 2008-08-08 22:55:12 UTC (rev 10159) +++ trunk/test/testlib.py 2008-08-08 23:53:44 UTC (rev 10160) @@ -3,7 +3,8 @@ gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') -sys.path.append(gajim_root + '/src') +# look for modules in the CWD, then gajim/src, then everywhere else +sys.path.insert(1, gajim_root + '/src') # a temporary version of ~/.gajim for testing configdir = gajim_root + '/test/tmp' @@ -34,4 +35,4 @@ import gtkgui_helpers gtkgui_helpers.GLADE_DIR = gajim_root + '/data/glade' -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

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

08 Aug '08

Author: bct Date: 2008-08-09 00:55:12 +0200 (Sat, 09 Aug 2008) New Revision: 10159 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: correctly decide whether to autonegotiate after a session was replaced Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-08 17:03:56 UTC (rev 10158) +++ trunk/src/chat_control.py 2008-08-08 22:55:12 UTC (rev 10159) @@ -1153,7 +1153,6 @@ self.print_esession_details() # Enable encryption if needed - self.no_autonegotiation = False e2e_is_active = self.session and self.session.enable_encryption self.gpg_is_active = False gpg_pref = gajim.config.get_per('contacts', contact.jid, @@ -2325,18 +2324,22 @@ self.account, 'autonegotiate_esessions') and \ gajim.config.get_per('contacts', self.contact.jid, 'autonegotiate_esessions') + want_e2e = not e2e_is_active and not self.gpg_is_active \ and e2e_pref + already_negotiating = bool(self.session and \ + self.session.status) + # XXX: Once we have fallback to disco, remove # notexistant check - if want_e2e and not self.no_autonegotiation \ - and gajim.HAVE_PYCRYPTO \ - and gajim.capscache.is_supported(self.contact, - NS_ESESSION) and not gajim.capscache.is_supported( - self.contact, 'notexistant'): + can_e2e = gajim.HAVE_PYCRYPTO and gajim.capscache. \ + is_supported(self.contact, NS_ESESSION) and \ + not gajim.capscache.is_supported(self.contact, + 'notexistant') + + if want_e2e and not already_negotiating and can_e2e: self.begin_e2e_negotiation() - self.no_autonegotiation = True else: self.send_chatstate('active', self.contact) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-08 17:03:56 UTC (rev 10158) +++ trunk/src/gajim.py 2008-08-08 22:55:12 UTC (rev 10159) @@ -816,9 +816,6 @@ for sess in conn.get_sessions(ji): if (ji+'/'+resource) != str(sess.jid): continue - ctrl = sess.control - if ctrl: - ctrl.no_autonegotiation = False if sess.enable_encryption: sess.terminate_e2e() conn.delete_session(jid,

1 0

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

08 Aug '08

Author: asterix Date: 2008-08-08 19:03:56 +0200 (Fri, 08 Aug 2008) New Revision: 10158 Modified: trunk/src/message_window.py Log: fix closing a tab Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-08 15:19:08 UTC (rev 10157) +++ trunk/src/message_window.py 2008-08-08 17:03:56 UTC (rev 10158) @@ -439,47 +439,57 @@ def remove_tab(self, ctrl, method, reason = None, force = False): '''reason is only for gc (offline status message) if force is True, do not ask any confirmation''' - # Shutdown the MessageControl - allow_shutdown = ctrl.allow_shutdown(method) - if not force and allow_shutdown == 'no': - return - if allow_shutdown == 'minimize' and method != self.CLOSE_COMMAND: - ctrl.minimize() - self.check_tabs() - return - if reason is not None: # We are leaving gc with a status message - ctrl.shutdown(reason) - else: # We are leaving gc without status message or it's a chat - ctrl.shutdown() + def close(ctrl): + if reason is not None: # We are leaving gc with a status message + ctrl.shutdown(reason) + else: # We are leaving gc without status message or it's a chat + ctrl.shutdown() + # Update external state + gajim.events.remove_events(ctrl.account, ctrl.get_full_jid, + types = ['printed_msg', 'chat', 'gc_msg']) - # Update external state - gajim.events.remove_events(ctrl.account, ctrl.get_full_jid, - types = ['printed_msg', 'chat', 'gc_msg']) + fjid = ctrl.get_full_jid() + jid = gajim.get_jid_without_resource(fjid) - fjid = ctrl.get_full_jid() - jid = gajim.get_jid_without_resource(fjid) + fctrl = self.get_control(fjid, ctrl.account) + bctrl = self.get_control(jid, ctrl.account) + # keep last_message_time around unless this was our last control with + # that jid + if not fctrl and not bctrl: + del gajim.last_message_time[ctrl.account][fjid] - fctrl = self.get_control(fjid, ctrl.account) - bctrl = self.get_control(jid, ctrl.account) - # keep last_message_time around unless this was our last control with - # that jid - if not fctrl and not bctrl: - del gajim.last_message_time[ctrl.account][fjid] + # Disconnect tab DnD only if GTK version < 2.10 + if gtk.pygtk_version < (2, 10, 0) or gtk.gtk_version < (2, 10, 0): + self.disconnect_tab_dnd(ctrl.widget) - # Disconnect tab DnD only if GTK version < 2.10 - if gtk.pygtk_version < (2, 10, 0) or gtk.gtk_version < (2, 10, 0): - self.disconnect_tab_dnd(ctrl.widget) + self.notebook.remove_page(self.notebook.page_num(ctrl.widget)) - self.notebook.remove_page(self.notebook.page_num(ctrl.widget)) + del self._controls[ctrl.account][fjid] - del self._controls[ctrl.account][fjid] + if len(self._controls[ctrl.account]) == 0: + del self._controls[ctrl.account] - if len(self._controls[ctrl.account]) == 0: - del self._controls[ctrl.account] + self.check_tabs() + self.show_title() - self.check_tabs() - self.show_title() + def on_yes(ctrl): + close(ctrl) + def on_no(ctrl): + if not force: + return + close(ctrl) + + def on_minimize(ctrl): + if method != self.CLOSE_COMMAND: + ctrl.minimize() + self.check_tabs() + return + close(ctrl) + + # Shutdown the MessageControl + ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) + def check_tabs(self): if self.get_num_controls() == 0: # These are not called when the window is destroyed like this, fake it

1 0

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

08 Aug '08

Author: asterix Date: 2008-08-08 17:19:08 +0200 (Fri, 08 Aug 2008) New Revision: 10157 Modified: trunk/src/chat_control.py trunk/src/dialogs.py trunk/src/groupchat_control.py trunk/src/gtkgui_helpers.py trunk/src/message_control.py trunk/src/message_window.py trunk/src/roster_window.py Log: warning dialogs when closing a chat window are non blocking Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/chat_control.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -2200,18 +2200,24 @@ self.conv_textview.del_handlers() self.msg_textview.destroy() - def allow_shutdown(self, method): + def allow_shutdown(self, method, on_yes, on_no, on_minimize): if time.time() - gajim.last_message_time[self.account]\ [self.get_full_jid()] < 2: # 2 seconds + def on_ok(): + on_yes(self) + + def on_cancel(): + on_no(self) + dialog = dialogs.ConfirmationDialog( # %s is being replaced in the code with JID _('You just received a new message from "%s"') % self.contact.jid, _('If you close this tab and you have history disabled, '\ - 'this message will be lost.')) - if dialog.get_response() != gtk.RESPONSE_OK: - return 'no' # stop the propagation of the event - return 'yes' + 'this message will be lost.'), on_response_ok=on_ok, + on_response_cancel=on_cancel) + return + on_yes(self) def handle_incoming_chatstate(self): ''' handle incoming chatstate that jid SENT TO us ''' Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/dialogs.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -1362,9 +1362,10 @@ def on_response_cancel(self, widget): if self.user_response_cancel: if isinstance(self.user_response_cancel, tuple): - self.user_response_cancel[0](*self.user_response_cancel[1:]) + self.user_response_cancel[0](self.is_checked(), + *self.user_response_cancel[1:]) else: - self.user_response_cancel() + self.user_response_cancel(self.is_checked()) self.destroy() def is_checked(self): Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/groupchat_control.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -1667,38 +1667,48 @@ # Remove unread events from systray gajim.events.remove_events(self.account, self.room_jid) - def allow_shutdown(self, method): + def allow_shutdown(self, method, on_yes, on_no, on_minimize): if self.contact.jid in gajim.config.get_per('accounts', self.account, 'minimized_gc').split(' '): - return 'minimize' + on_minimize(self) + return if method == self.parent_win.CLOSE_ESC: model, iter = self.list_treeview.get_selection().get_selected() if iter: self.list_treeview.get_selection().unselect_all() - return 'no' - retval = 'yes' + on_no(self) + return includes = gajim.config.get('confirm_close_muc_rooms').split(' ') excludes = gajim.config.get('noconfirm_close_muc_rooms').split(' ') # whether to ask for comfirmation before closing muc if (gajim.config.get('confirm_close_muc') or self.room_jid in includes) \ and gajim.gc_connected[self.account][self.room_jid] and self.room_jid not\ in excludes: + + def on_ok(clicked): + if clicked: + # user does not want to be asked again + gajim.config.set('confirm_close_muc', False) + on_yes(self) + + def on_cancel(clicked): + if clicked: + # user does not want to be asked again + gajim.config.set('confirm_close_muc', False) + on_no(self) + pritext = _('Are you sure you want to leave group chat "%s"?')\ % self.name sectext = _('If you close this window, you will be disconnected ' 'from this group chat.') dialog = dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again')) + _('Do _not ask me again'), on_response_ok=on_ok, + on_response_cancel=on_cancel) + return - if dialog.get_response() != gtk.RESPONSE_OK: - retval = 'no' + on_yes(self) - if dialog.is_checked(): # user does not want to be asked again - gajim.config.set('confirm_close_muc', False) - - return retval - def set_control_active(self, state): self.conv_textview.allow_focus_out_line = True self.attention_flag = False Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/gtkgui_helpers.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -730,9 +730,8 @@ sectext = _('Would you like to make Gajim the default Jabber client?') checktext = _('Always check to see if Gajim is the default Jabber client ' 'on startup') - def on_cancel(): - gajim.config.set('check_if_gajim_is_default', - dlg.is_checked()) + def on_cancel(checked): + gajim.config.set('check_if_gajim_is_default', checked) dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, set_gajim_as_xmpp_handler, on_cancel) if gajim.config.get('check_if_gajim_is_default'): Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/message_control.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -62,12 +62,14 @@ or inactive (state is False)''' pass # Derived classes MUST implement this method - def allow_shutdown(self, method): + def allow_shutdown(self, method, on_response_yes, on_response_no, + on_response_minimize): '''Called to check is a control is allowed to shutdown. If a control is not in a suitable shutdown state this method - should return 'no', else 'yes' or 'minimize' ''' + should call on_response_no, else on_response_yes or + on_response_minimize ''' # NOTE: Derived classes MAY implement this - return 'yes' + on_response_yes(self) def shutdown(self): # NOTE: Derived classes MUST implement this Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/message_window.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -65,6 +65,8 @@ # dict { handler id: widget}. Keeps callbacks, which # lead to cylcular references self.handlers = {} + # Don't show warning dialogs when we want to delete the window + self.dont_warn_on_delete = False self.widget_name = 'message_window' self.xml = gtkgui_helpers.get_glade('%s.glade' % self.widget_name) @@ -182,18 +184,30 @@ self.redraw_tab(ctrl) def _on_window_delete(self, win, event): + if self.dont_warn_on_delete: + # Destroy the window + return False + + def on_yes(ctrl): + if self.on_delete_ok == 1: + self.dont_warn_on_delete = True + win.destroy() + self.on_delete_ok -= 1 + + def on_no(ctrl): + return + + def on_minimize(ctrl): + self.on_delete_ok -= 1 + ctrl.minimize() + # Make sure all controls are okay with being deleted ctrl_to_minimize = [] + self.on_delete_ok = self.get_nb_controls() for ctrl in self.controls(): - allow_shutdown = ctrl.allow_shutdown(self.CLOSE_CLOSE_BUTTON) - if allow_shutdown == 'no': - return True # halt the delete - elif allow_shutdown == 'minimize': - ctrl_to_minimize.append(ctrl) - # If all are ok, minimize the one that need to be minimized - for ctrl in ctrl_to_minimize: - ctrl.minimize() - return False + ctrl.allow_shutdown(self.CLOSE_CLOSE_BUTTON, on_yes, on_no, + on_minimize) + return True # halt the delete for the moment def _on_window_destroy(self, win): for ctrl in self.controls(): @@ -607,6 +621,13 @@ for ctrl in jid_dict.values(): yield ctrl + def get_nb_controls(self): + nb_ctrl = 0 + for jid_dict in self._controls.values(): + for ctrl in jid_dict.values(): + nb_ctrl += 1 + return nb_ctrl + def move_to_next_unread_tab(self, forward): ind = self.notebook.get_current_page() current = ind Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-08 10:30:28 UTC (rev 10156) +++ trunk/src/roster_window.py 2008-08-08 15:19:08 UTC (rev 10157) @@ -3795,7 +3795,7 @@ 'line. Generally it is used when the same person has several Jabber ' 'accounts or transport accounts.') dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again'), on_response_ok = merge_contacts) + _('Do _not ask me again'), on_response_ok=merge_contacts) if not confirm_metacontacts: # First time we see this window dlg.checkbutton.set_active(True)

1 0

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

08 Aug '08

Author: asterix Date: 2008-08-08 12:30:28 +0200 (Fri, 08 Aug 2008) New Revision: 10156 Modified: trunk/src/config.py Log: remove no more used class Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-08-08 10:26:11 UTC (rev 10155) +++ trunk/src/config.py 2008-08-08 10:30:28 UTC (rev 10156) @@ -3450,212 +3450,6 @@ gajim.interface.roster.set_actions_menu_needs_rebuild() gajim.interface.save_config() -#---------- ZeroconfPropertiesWindow class -------------# -class ZeroconfPropertiesWindow: - def __init__(self): - self.xml = gtkgui_helpers.get_glade('zeroconf_properties_window.glade') - self.window = self.xml.get_widget('zeroconf_properties_window') - self.window.set_transient_for(gajim.interface.roster.window) - self.xml.signal_autoconnect(self) - - self.init_account() - self.init_account_gpg() - - self.xml.get_widget('save_button').grab_focus() - self.window.show_all() - - def init_account(self): - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'autoconnect') - if st: - self.xml.get_widget('autoconnect_checkbutton').set_active(st) - - list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME,'no_log_for').split() - if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - self.xml.get_widget('log_history_checkbutton').set_active(0) - else: - self.xml.get_widget('log_history_checkbutton').set_active(1) - - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'sync_with_global_status') - if st: - self.xml.get_widget('sync_with_global_status_checkbutton').set_active( - st) - - for opt in ('first_name', 'last_name', 'jabber_id', 'email'): - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'zeroconf_' + opt) - if st: - self.xml.get_widget(opt + '_entry').set_text(st) - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') - if st: - self.xml.get_widget('custom_port_entry').set_text(str(st)) - - st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'use_custom_host') - if st: - self.xml.get_widget('custom_port_checkbutton').set_active(st) - - self.xml.get_widget('custom_port_entry').set_sensitive(bool(st)) - - if not st: - gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port', '5298') - - def init_account_gpg(self): - keyid = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'keyid') - keyname = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'keyname') - savegpgpass = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'savegpgpass') - - if not keyid or not gajim.config.get('usegpg'): - return - - self.xml.get_widget('gpg_key_label').set_text(keyid) - self.xml.get_widget('gpg_name_label').set_text(keyname) - gpg_save_password_checkbutton = \ - self.xml.get_widget('gpg_save_password_checkbutton') - gpg_save_password_checkbutton.set_sensitive(True) - gpg_save_password_checkbutton.set_active(savegpgpass) - - if savegpgpass: - entry = self.xml.get_widget('gpg_password_entry') - entry.set_sensitive(True) - gpgpassword = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'gpgpassword') - entry.set_text(gpgpassword) - - def on_zeroconf_properties_window_destroy(self, widget): - # close window - if gajim.interface.instances.has_key('zeroconf_properties'): - del gajim.interface.instances['zeroconf_properties'] - - def on_custom_port_checkbutton_toggled(self, widget): - st = self.xml.get_widget('custom_port_checkbutton').get_active() - self.xml.get_widget('custom_port_entry').set_sensitive(bool(st)) - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def on_save_button_clicked(self, widget): - config = {} - - st = self.xml.get_widget('autoconnect_checkbutton').get_active() - config['autoconnect'] = st - list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() - if gajim.ZEROCONF_ACC_NAME in list_no_log_for: - list_no_log_for.remove(gajim.ZEROCONF_ACC_NAME) - if not self.xml.get_widget('log_history_checkbutton').get_active(): - list_no_log_for.append(gajim.ZEROCONF_ACC_NAME) - config['no_log_for'] = ' '.join(list_no_log_for) - - st = self.xml.get_widget('sync_with_global_status_checkbutton').\ - get_active() - config['sync_with_global_status'] = st - - st = self.xml.get_widget('first_name_entry').get_text() - config['zeroconf_first_name'] = st.decode('utf-8') - - st = self.xml.get_widget('last_name_entry').get_text() - config['zeroconf_last_name'] = st.decode('utf-8') - - st = self.xml.get_widget('jabber_id_entry').get_text() - config['zeroconf_jabber_id'] = st.decode('utf-8') - - st = self.xml.get_widget('email_entry').get_text() - config['zeroconf_email'] = st.decode('utf-8') - - use_custom_port = self.xml.get_widget('custom_port_checkbutton').\ - get_active() - config['use_custom_host'] = use_custom_port - - old_port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') - if use_custom_port: - port = self.xml.get_widget('custom_port_entry').get_text() - else: - port = 5298 - - config['custom_port'] = port - - config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().\ - decode('utf-8') - if config['keyname'] == '': # no key selected - config['keyid'] = '' - config['savegpgpass'] = False - config['gpgpassword'] = '' - else: - config['keyid'] = self.xml.get_widget('gpg_key_label').get_text().\ - decode('utf-8') - config['savegpgpass'] = self.xml.get_widget( - 'gpg_save_password_checkbutton').get_active() - config['gpgpassword'] = self.xml.get_widget('gpg_password_entry' - ).get_text().decode('utf-8') - - reconnect = False - for opt in ('zeroconf_first_name','zeroconf_last_name', - 'zeroconf_jabber_id', 'zeroconf_email', 'custom_port'): - if gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, opt) != \ - config[opt]: - reconnect = True - - for opt in config: - gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, opt, - config[opt]) - - if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): - if port != old_port or reconnect: - gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() - - self.window.destroy() - - def on_gpg_choose_button_clicked(self, widget, data = None): - if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): - secret_keys = gajim.connections[gajim.ZEROCONF_ACC_NAME].\ - ask_gpg_secrete_keys() - - # self.account is None and/or gajim.connections is {} - else: - if gajim.HAVE_GPG: - secret_keys = GnuPG.GnuPG().get_secret_keys() - else: - secret_keys = [] - if not secret_keys: - dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There was a problem retrieving your OpenPGP secret keys.')) - return - secret_keys[_('None')] = _('None') - instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), - _('Choose your OpenPGP key'), secret_keys) - keyID = instance.run() - if keyID is None: - return - checkbutton = self.xml.get_widget('gpg_save_password_checkbutton') - gpg_key_label = self.xml.get_widget('gpg_key_label') - gpg_name_label = self.xml.get_widget('gpg_name_label') - if keyID[0] == _('None'): - gpg_key_label.set_text(_('No key selected')) - gpg_name_label.set_text('') - checkbutton.set_sensitive(False) - self.xml.get_widget('gpg_password_entry').set_sensitive(False) - else: - gpg_key_label.set_text(keyID[0]) - gpg_name_label.set_text(keyID[1]) - checkbutton.set_sensitive(True) - checkbutton.set_active(False) - self.xml.get_widget('gpg_password_entry').set_text('') - - def on_gpg_save_password_checkbutton_toggled(self, widget): - st = widget.get_active() - w = self.xml.get_widget('gpg_password_entry') - w.set_sensitive(bool(st)) - class ManagePEPServicesWindow: def __init__(self, account): self.xml = gtkgui_helpers.get_glade('manage_pep_services_window.glade')

1 0

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

08 Aug '08

Author: asterix Date: 2008-08-08 12:26:11 +0200 (Fri, 08 Aug 2008) New Revision: 10155 Modified: trunk/src/config.py trunk/src/dialogs.py trunk/src/roster_window.py Log: gpg key chooser dialog not blocker Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-08-08 09:08:42 UTC (rev 10154) +++ trunk/src/config.py 2008-08-08 10:26:11 UTC (rev 10155) @@ -2021,37 +2021,40 @@ _('There was a problem retrieving your OpenPGP secret keys.')) return secret_keys[_('None')] = _('None') + + def on_key_selected(keyID): + if keyID is None: + return + if self.current_account == gajim.ZEROCONF_ACC_NAME: + wiget_name_ext = '2' + else: + wiget_name_ext = '1' + gpg_key_label = self.xml.get_widget('gpg_key_label' + wiget_name_ext) + gpg_name_label = self.xml.get_widget('gpg_name_label' + wiget_name_ext) + use_gpg_agent_checkbutton = self.xml.get_widget( + 'use_gpg_agent_checkbutton' + wiget_name_ext) + if keyID[0] == _('None'): + gpg_key_label.set_text(_('No key selected')) + gpg_name_label.set_text('') + use_gpg_agent_checkbutton.set_sensitive(False) + if self.option_changed('keyid', ''): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'keyname', + '') + gajim.config.set_per('accounts', self.current_account, 'keyid', '') + else: + gpg_key_label.set_text(keyID[0]) + gpg_name_label.set_text(keyID[1]) + use_gpg_agent_checkbutton.set_sensitive(True) + if self.option_changed('keyid', keyID[0]): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'keyname', + keyID[1]) + gajim.config.set_per('accounts', self.current_account, 'keyid', + keyID[0]) + instance = dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'), - _('Choose your OpenPGP key'), secret_keys) - keyID = instance.run() - if keyID is None: - return - if self.current_account == gajim.ZEROCONF_ACC_NAME: - wiget_name_ext = '2' - else: - wiget_name_ext = '1' - gpg_key_label = self.xml.get_widget('gpg_key_label' + wiget_name_ext) - gpg_name_label = self.xml.get_widget('gpg_name_label' + wiget_name_ext) - use_gpg_agent_checkbutton = self.xml.get_widget( - 'use_gpg_agent_checkbutton' + wiget_name_ext) - if keyID[0] == _('None'): - gpg_key_label.set_text(_('No key selected')) - gpg_name_label.set_text('') - use_gpg_agent_checkbutton.set_sensitive(False) - if self.option_changed('keyid', ''): - self.need_relogin = True - gajim.config.set_per('accounts', self.current_account, 'keyname', '') - gajim.config.set_per('accounts', self.current_account, 'keyid', '') - else: - gpg_key_label.set_text(keyID[0]) - gpg_name_label.set_text(keyID[1]) - use_gpg_agent_checkbutton.set_sensitive(True) - if self.option_changed('keyid', keyID[0]): - self.need_relogin = True - gajim.config.set_per('accounts', self.current_account, 'keyname', - keyID[1]) - gajim.config.set_per('accounts', self.current_account, 'keyid', - keyID[0]) + _('Choose your OpenPGP key'), secret_keys, on_key_selected) def on_use_gpg_agent_checkbutton_toggled(self, widget): if self.current_account == gajim.ZEROCONF_ACC_NAME: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-08 09:08:42 UTC (rev 10154) +++ trunk/src/dialogs.py 2008-08-08 10:26:11 UTC (rev 10155) @@ -256,8 +256,10 @@ class ChooseGPGKeyDialog: '''Class for GPG key dialog''' - def __init__(self, title_text, prompt_text, secret_keys, selected = None): - #list : {keyID: userName, ...} + def __init__(self, title_text, prompt_text, secret_keys, on_response, + selected=None): + '''secret_keys : {keyID: userName, ...}''' + self.on_response = on_response xml = gtkgui_helpers.get_glade('choose_gpg_key_dialog.glade') self.window = xml.get_widget('choose_gpg_key_dialog') self.window.set_title(title_text) @@ -279,6 +281,7 @@ col.set_sort_column_id(1) self.keys_treeview.set_search_column(1) self.fill_tree(secret_keys, selected) + self.window.connect('response', self.on_dialog_response) self.window.show_all() def sort_keys(self, model, iter1, iter2): @@ -292,17 +295,16 @@ return -1 return 1 - def run(self): - rep = self.window.run() + def on_dialog_response(self, dialog, response): selection = self.keys_treeview.get_selection() (model, iter) = selection.get_selected() - if iter and rep == gtk.RESPONSE_OK: + if iter and response == gtk.RESPONSE_OK: keyID = [ model[iter][0].decode('utf-8'), model[iter][1].decode('utf-8') ] else: keyID = None + self.on_response(keyID) self.window.destroy() - return keyID def fill_tree(self, list, selected): model = self.keys_treeview.get_model() @@ -1583,12 +1585,6 @@ def on_cancelbutton_clicked(self, widget): self.dialog.destroy() - def get_response(self): - if self.is_modal: - response = self.dialog.run() - self.dialog.destroy() - return response - class SubscriptionRequestWindow: def __init__(self, jid, text, account, user_nick=None): xml = gtkgui_helpers.get_glade('subscription_request_window.glade') Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-08 09:08:42 UTC (rev 10154) +++ trunk/src/roster_window.py 2008-08-08 10:26:11 UTC (rev 10155) @@ -2747,41 +2747,42 @@ attached_keys = gajim.config.get_per('accounts', account, 'attached_gpg_keys').split() keys = {} - #GPG Key keyID = _('None') for i in xrange(len(attached_keys)/2): keys[attached_keys[2*i]] = attached_keys[2*i+1] if attached_keys[2*i] == contact.jid: keyID = attached_keys[2*i+1] public_keys = gajim.connections[account].ask_gpg_keys() - #GPG Key public_keys[_('None')] = _('None') - instance = dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'), - _('Select a key to apply to the contact'), public_keys, keyID) - keyID = instance.run() - if keyID is None: - return - #GPG Key - if keyID[0] == _('None'): - if contact.jid in keys: - del keys[contact.jid] - keyID = '' - else: - keyID = keyID[0] - keys[contact.jid] = keyID - ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) - if ctrl: - ctrl.update_ui() + def on_key_selected(keyID): + if keyID is None: + return + if keyID[0] == _('None'): + if contact.jid in keys: + del keys[contact.jid] + keyID = '' + else: + keyID = keyID[0] + keys[contact.jid] = keyID - keys_str = '' - for jid in keys: - keys_str += jid + ' ' + keys[jid] + ' ' - gajim.config.set_per('accounts', account, 'attached_gpg_keys', keys_str) - for u in gajim.contacts.get_contacts(account, contact.jid): - u.keyID = helpers.prepare_and_validate_gpg_keyID(account, + ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) + if ctrl: + ctrl.update_ui() + + keys_str = '' + for jid in keys: + keys_str += jid + ' ' + keys[jid] + ' ' + gajim.config.set_per('accounts', account, 'attached_gpg_keys', + keys_str) + for u in gajim.contacts.get_contacts(account, contact.jid): + u.keyID = helpers.prepare_and_validate_gpg_keyID(account, contact.jid, keyID) + instance = dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'), + _('Select a key to apply to the contact'), public_keys, + on_key_selected, selected=keyID) + def on_set_custom_avatar_activate(self, widget, contact, account): def on_ok(widget, path_to_file): filesize = os.path.getsize(path_to_file) # in bytes

1 0

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

08 Aug '08

Author: roidelapluie Date: 2008-08-08 11:08:42 +0200 (Fri, 08 Aug 2008) New Revision: 10154 Modified: trunk/src/groupchat_control.py Log: clarify my last commit [10153] Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-08 08:59:31 UTC (rev 10153) +++ trunk/src/groupchat_control.py 2008-08-08 09:08:42 UTC (rev 10154) @@ -1778,6 +1778,7 @@ treeview = gajim.interface.roster.tree model = treeview.get_model() if not selection.data or target_type == 80: + # target_type = 80 means a file is dropped return data = selection.data path = treeview.get_selection().get_selected_rows()[1][0]

1 0

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

08 Aug '08

Author: roidelapluie Date: 2008-08-08 10:59:31 +0200 (Fri, 08 Aug 2008) New Revision: 10153 Modified: trunk/src/groupchat_control.py Log: Prevent a traceback when dragging a file over a groupchat. Fix #4142. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-07 22:08:08 UTC (rev 10152) +++ trunk/src/groupchat_control.py 2008-08-08 08:59:31 UTC (rev 10153) @@ -1777,7 +1777,7 @@ # Invite contact to groupchat treeview = gajim.interface.roster.tree model = treeview.get_model() - if not selection.data: + if not selection.data or target_type == 80: return data = selection.data path = treeview.get_selection().get_selected_rows()[1][0]

1 0

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

07 Aug '08

Author: asterix Date: 2008-08-08 00:08:08 +0200 (Fri, 08 Aug 2008) New Revision: 10152 Modified: trunk/src/dialogs.py Log: coding standards Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-07 21:59:20 UTC (rev 10151) +++ trunk/src/dialogs.py 2008-08-07 22:08:08 UTC (rev 10152) @@ -1476,8 +1476,6 @@ label.set_markup(label_str) self.cancel_handler = cancel_handler - self.is_modal = is_modal - self.ok_handler = ok_handler okbutton = self.xml.get_widget('okbutton') okbutton.connect('clicked', self.on_okbutton_clicked) @@ -1506,8 +1504,8 @@ class InputDialog(CommonInputDialog): '''Class for Input dialog''' - def __init__(self, title, label_str, input_str = None, is_modal = True, - ok_handler = None, cancel_handler = None): + def __init__(self, title, label_str, input_str=None, is_modal=True, + ok_handler=None, cancel_handler=None): self.xml = gtkgui_helpers.get_glade('input_dialog.glade') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, cancel_handler) @@ -1521,8 +1519,8 @@ class InputTextDialog(CommonInputDialog): '''Class for multilines Input dialog (more place than InputDialog)''' - def __init__(self, title, label_str, input_str = None, is_modal = True, - ok_handler = None, cancel_handler = None): + def __init__(self, title, label_str, input_str=None, is_modal=True, + ok_handler=None, cancel_handler=None): self.xml = gtkgui_helpers.get_glade('input_text_dialog.glade') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, cancel_handler) @@ -1538,9 +1536,8 @@ class DubbleInputDialog: '''Class for Dubble Input dialog''' - def __init__(self, title, label_str1, label_str2, input_str1 = None, - input_str2 = None, is_modal = True, ok_handler = None, - cancel_handler = None): + def __init__(self, title, label_str1, label_str2, input_str1=None, + input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None): # if modal is True you also need to call get_response() # and ok_handler won't be used self.xml = gtkgui_helpers.get_glade('dubbleinput_dialog.glade') @@ -1593,7 +1590,7 @@ return response class SubscriptionRequestWindow: - def __init__(self, jid, text, account, user_nick = None): + def __init__(self, jid, text, account, user_nick=None): xml = gtkgui_helpers.get_glade('subscription_request_window.glade') self.window = xml.get_widget('subscription_request_window') self.jid = jid @@ -1657,8 +1654,8 @@ class JoinGroupchatWindow: - def __init__(self, account, room_jid = '', nick = '', password = '', - automatic = False): + def __init__(self, account, room_jid='', nick='', password='', + automatic=False): '''automatic is a dict like {'invities': []} If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited''' @@ -2019,8 +2016,8 @@ self.on_response(password1) class PopupNotificationWindow: - def __init__(self, event_type, jid, account, msg_type = '', - path_to_image = None, title = None, text = None): + def __init__(self, event_type, jid, account, msg_type='', + path_to_image=None, title=None, text=None): self.account = account self.jid = jid self.msg_type = msg_type @@ -2089,7 +2086,8 @@ pos_x = gtk.gdk.screen_width() - window_width + pos_x + 1 pos_y = gajim.config.get('notification_position_y') if pos_y < 0: - pos_y = gtk.gdk.screen_height() - gajim.interface.roster.popups_notification_height + pos_y + 1 + pos_y = gtk.gdk.screen_height() - \ + gajim.interface.roster.popups_notification_height + pos_y + 1 self.window.move(pos_x, pos_y) xml.signal_autoconnect(self) @@ -2110,7 +2108,7 @@ if len(gajim.interface.roster.popup_notification_windows) > 0: # we want to remove the first window added in the list - gajim.interface.roster.popup_notification_windows.pop(0) # remove 1st item + gajim.interface.roster.popup_notification_windows.pop(0) # move the rest of popup windows gajim.interface.roster.popups_notification_height = 0 @@ -2118,7 +2116,8 @@ window_width, window_height = window_instance.window.get_size() gajim.interface.roster.popups_notification_height += window_height window_instance.window.move(gtk.gdk.screen_width() - window_width, - gtk.gdk.screen_height() - gajim.interface.roster.popups_notification_height) + gtk.gdk.screen_height() - \ + gajim.interface.roster.popups_notification_height) def on_popup_notification_window_button_press_event(self, widget, event): if event.button != 1: @@ -2169,14 +2168,16 @@ self.conversation_textview.tv) self.form_widget = None - parent_box = self.xml.get_widget('conversation_scrolledwindow').get_parent() + parent_box = self.xml.get_widget('conversation_scrolledwindow').\ + get_parent() if form_node: dataform = dataforms.ExtendForm(node = form_node) self.form_widget = dataforms_widget.DataFormWidget(dataform) self.form_widget.show_all() parent_box.add(self.form_widget) parent_box.child_set_property(self.form_widget, 'position', - parent_box.child_get_property(self.xml.get_widget('conversation_scrolledwindow'), 'position')) + parent_box.child_get_property(self.xml.get_widget( + 'conversation_scrolledwindow'), 'position')) self.action = 'form' self.send_button = self.xml.get_widget('send_button') @@ -2362,7 +2363,8 @@ if self.session: session = self.session else: - session = gajim.connections[self.account].make_new_session(to_whom_jid) + session = gajim.connections[self.account].make_new_session( + to_whom_jid) if self.form_widget: form_node = self.form_widget.data_form @@ -2484,7 +2486,8 @@ _('Please make sure you are connected with "%s".') % self.account) return begin_iter, end_iter = self.input_tv_buffer.get_bounds() - stanza = self.input_tv_buffer.get_text(begin_iter, end_iter).decode('utf-8') + stanza = self.input_tv_buffer.get_text(begin_iter, end_iter).decode( + 'utf-8') if stanza: gajim.connections[self.account].send_stanza(stanza) self.input_tv_buffer.set_text('') # we sent ok, clear the textview @@ -3005,8 +3008,8 @@ class SoundChooserDialog(FileChooserDialog): - def __init__(self, path_to_snd_file = '', on_response_ok = None, - on_response_cancel = None): + def __init__(self, path_to_snd_file='', on_response_ok=None, + on_response_cancel=None): '''optionally accepts path_to_snd_file so it has that as selected''' def on_ok(widget, callback): '''check if file exists and call callback''' @@ -3041,8 +3044,8 @@ self.set_filename(path_to_snd_file) class ImageChooserDialog(FileChooserDialog): - def __init__(self, path_to_file = '', on_response_ok = None, - on_response_cancel = None): + def __init__(self, path_to_file='', on_response_ok=None, + on_response_cancel=None): '''optionally accepts path_to_snd_file so it has that as selected''' def on_ok(widget, callback): '''check if file exists and call callback''' @@ -3114,8 +3117,8 @@ widget.get_preview_widget().set_from_pixbuf(pixbuf) class AvatarChooserDialog(ImageChooserDialog): - def __init__(self, path_to_file = '', on_response_ok = None, - on_response_cancel = None, on_response_clear = None): + def __init__(self, path_to_file='', on_response_ok=None, + on_response_cancel=None, on_response_clear=None): ImageChooserDialog.__init__(self, path_to_file, on_response_ok, on_response_cancel) button = gtk.Button(None, gtk.STOCK_CLEAR) @@ -3575,7 +3578,7 @@ else: self.sound_file_hbox.set_sensitive(False) - def on_browse_for_sounds_button_clicked(self, widget, data = None): + def on_browse_for_sounds_button_clicked(self, widget, data=None): if self.active_num < 0: return @@ -3647,7 +3650,7 @@ class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them instances = [] - def __init__(self, account, jids, preselected = None): + def __init__(self, account, jids, preselected=None): '''This window is used to trasform a one-to-one chat to a MUC. We do 2 things: first select the server and then make a guests list.''' @@ -3776,7 +3779,8 @@ def unique_room_id_error(self, server): self.unique_room_id_supported(server, - gajim.nicks[self.account].lower().replace(' ','') + str(randrange(9999999))) + gajim.nicks[self.account].lower().replace(' ','') + str(randrange( + 9999999))) class DataFormWindow(Dialog): def __init__(self, form, on_response_ok):

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
28
Older →

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