Commits October 2008

commits@gajim.org

5 participants
128 discussions

[commit-gajim] r10522 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 15:10:53 +0200 (Sat, 11 Oct 2008) New Revision: 10522 Modified: trunk/src/tooltips.py Log: fix dict.get() call. Fixes #4402 Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-10-11 13:06:59 UTC (rev 10521) +++ trunk/src/tooltips.py 2008-10-11 13:10:53 UTC (rev 10522) @@ -581,7 +581,8 @@ to the given property list. ''' if 'mood' in contact.mood: - mood = MOODS.get(mood, contact.mood['mood'].strip()) + mood = contact.mood['mood'].strip() + mood = MOODS.get(mood, mood) mood = gobject.markup_escape_text(mood) mood_string = _('Mood:') + ' %s' % mood if 'text' in contact.mood \

1 0

[commit-gajim] r10521 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 15:06:59 +0200 (Sat, 11 Oct 2008) New Revision: 10521 Modified: trunk/src/message_window.py Log: [Mishail] fix var name. Fixes #4403 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-11 10:51:26 UTC (rev 10520) +++ trunk/src/message_window.py 2008-10-11 13:06:59 UTC (rev 10521) @@ -442,9 +442,9 @@ window_mode = gajim.interface.msg_win_mgr.mode if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: # Show the plural form since number of tabs > 1 - if self.type == 'chat': + if self.type_ == 'chat': label = _('Chats') - elif self.type == 'gc': + elif self.type_ == 'gc': label = _('Group Chats') else: label = _('Private Chats')

1 0

[commit-gajim] r10520 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:51:26 +0200 (Sat, 11 Oct 2008) New Revision: 10520 Modified: trunk/src/gajim.py Log: re-add badly removed line in [10506] Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 10:49:52 UTC (rev 10519) +++ trunk/src/gajim.py 2008-10-11 10:51:26 UTC (rev 10520) @@ -3031,6 +3031,7 @@ return True window.connect('delete_event',on_delete) view.updateNamespace({'gajim': gajim}) + gajim.ipython_window = window def __init__(self): gajim.interface = self

1 0

[commit-gajim] r10519 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:49:52 +0200 (Sat, 11 Oct 2008) New Revision: 10519 Modified: trunk/src/gajim.py Log: remove debuging ipython window creation. Fixes #4401 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 10:22:04 UTC (rev 10518) +++ trunk/src/gajim.py 2008-10-11 10:49:52 UTC (rev 10519) @@ -3283,7 +3283,6 @@ gobject.timeout_add(200, self.process_connections) gobject.timeout_add_seconds(gajim.config.get( 'check_idle_every_foo_seconds'), self.read_sleepy) - self.create_ipython_window() if __name__ == '__main__': def sigint_cb(num, stack):

1 0

[commit-gajim] r10518 - in trunk: src src/common src/common/xmpp src/common/zeroconf test test/lib
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:22:04 +0200 (Sat, 11 Oct 2008) New Revision: 10518 Modified: trunk/src/advanced.py trunk/src/cell_renderer_image.py trunk/src/chat_control.py trunk/src/common/GnuPG.py trunk/src/common/caps.py trunk/src/common/commands.py trunk/src/common/config.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/crypto.py trunk/src/common/dataforms.py trunk/src/common/helpers.py trunk/src/common/logger.py trunk/src/common/nslookup.py trunk/src/common/pubsub.py trunk/src/common/stanza_session.py trunk/src/common/xmpp/browser.py trunk/src/common/xmpp/commands.py trunk/src/common/xmpp/features.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dataforms_widget.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/filetransfers_window.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/gtkexcepthook.py trunk/src/gtkgui_helpers.py trunk/src/htmltextview.py trunk/src/message_control.py trunk/src/message_window.py trunk/src/notify.py trunk/src/remote_control.py trunk/src/session.py trunk/test/lib/mocks.py trunk/test/test_misc_interface.py Log: [thorstenp] rename some var to not hide builts-in functions (list -> list_, ...) Modified: trunk/src/advanced.py =================================================================== --- trunk/src/advanced.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/advanced.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -102,24 +102,24 @@ self.restart_label.hide() gajim.interface.instances['advanced_config'] = self - def cb_value_column_data(self, col, cell, model, iter): + def cb_value_column_data(self, col, cell, model, iter_): '''check if it's boolen or holds password stuff and if yes make the cellrenderertext not editable else it's editable''' - optname = model[iter][C_PREFNAME] - opttype = model[iter][C_TYPE] + optname = model[iter_][C_PREFNAME] + opttype = model[iter_][C_TYPE] if opttype == self.types['boolean'] or optname == 'password': cell.set_property('editable', False) else: cell.set_property('editable', True) - def get_option_path(self, model, iter): + def get_option_path(self, model, iter_): # It looks like path made from reversed array # path[0] is the true one optname # path[1] is the key name # path[2] is the root of tree # last two is optional - path = [model[iter][0].decode('utf-8')] - parent = model.iter_parent(iter) + path = [model[iter_][0].decode('utf-8')] + parent = model.iter_parent(iter_) while parent: path.append(model[parent][0].decode('utf-8')) parent = model.iter_parent(parent) @@ -249,14 +249,14 @@ value = self.right_true_dict[value] model.append(iter, [name, value, type]) - def visible_func(self, model, iter): + def visible_func(self, model, iter_): str = self.entry.get_text().decode('utf-8') if str in (None, ''): return True # show all - name = model[iter][C_PREFNAME].decode('utf-8') + name = model[iter_][C_PREFNAME].decode('utf-8') # If a child of the iter matches, we return True - if model.iter_has_child(iter): - iterC = model.iter_children(iter) + if model.iter_has_child(iter_): + iterC = model.iter_children(iter_) while iterC: nameC = model[iterC][C_PREFNAME].decode('utf-8') if model.iter_has_child(iterC): Modified: trunk/src/cell_renderer_image.py =================================================================== --- trunk/src/cell_renderer_image.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/cell_renderer_image.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -45,9 +45,9 @@ def do_get_property(self, pspec): return getattr(self, pspec.name) - def func(self, model, path, iter, image_tree): + def func(self, model, path, iter_, image_tree): image, tree = image_tree - if model.get_value(iter, self.tv_index) != image: + if model.get_value(iter_, self.tv_index) != image: return self.redraw = 1 col = tree.get_column(self.col_index) Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/chat_control.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -593,7 +593,7 @@ return True return False - def send_message(self, message, keyID = '', type = 'chat', chatstate = None, + def send_message(self, message, keyID = '', type_ = 'chat', chatstate = None, msg_id = None, composing_xep = None, resource = None, process_command = True): '''Send the given message to the active tab. Doesn't return None if error @@ -604,7 +604,7 @@ ret = None if not process_command or not self._process_command(message): - ret = MessageControl.send_message(self, message, keyID, type = type, + ret = MessageControl.send_message(self, message, keyID, type_ = type_, chatstate = chatstate, msg_id = msg_id, composing_xep = composing_xep, resource = resource, user_nick = self.user_nick) @@ -1720,7 +1720,7 @@ self._schedule_activity_timers() id = ChatControlBase.send_message(self, message, keyID, - type = 'chat', chatstate = chatstate_to_send, + type_ = 'chat', chatstate = chatstate_to_send, composing_xep = composing_xep, process_command = process_command) if id: Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/GnuPG.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -68,12 +68,12 @@ resp[ keyword ] = "" return resp - def encrypt(self, str, recipients): + def encrypt(self, str_, recipients): self.options.recipients = recipients # a list! proc = self.run(['--encrypt'], create_fhs=['stdin', 'stdout', 'status', 'stderr']) - proc.handles['stdin'].write(str) + proc.handles['stdin'].write(str_) try: proc.handles['stdin'].close() except IOError: @@ -103,9 +103,9 @@ error = '' return self._stripHeaderFooter(output), error - def decrypt(self, str, keyID): + def decrypt(self, str_, keyID): proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout']) - enc = self._addHeaderFooter(str, 'MESSAGE') + enc = self._addHeaderFooter(str_, 'MESSAGE') proc.handles['stdin'].write(enc) proc.handles['stdin'].close() @@ -116,9 +116,9 @@ except IOError: pass return output - def sign(self, str, keyID): + def sign(self, str_, keyID): proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr']) - proc.handles['stdin'].write(str) + proc.handles['stdin'].write(str_) try: proc.handles['stdin'].close() except IOError: @@ -144,12 +144,12 @@ return self._stripHeaderFooter(output) return 'BAD_PASSPHRASE' - def verify(self, str, sign): - if str is None: + def verify(self, str_, sign): + if str_ is None: return '' f = tmpfile() fd = f.fileno() - f.write(str) + f.write(str_) f.seek(0) proc = self.run(['--verify', '--enable-special-filenames', '-', '-&%s'%fd], create_fhs=['stdin', 'status', 'stderr']) @@ -215,13 +215,13 @@ line = '\n'.join(lines[0:i]) return line - def _addHeaderFooter(self, data, type): + def _addHeaderFooter(self, data, type_): """Add header and footer from data""" - out = "-----BEGIN PGP %s-----\n" % type + out = "-----BEGIN PGP %s-----\n" % type_ out = out + "Version: PGP\n" out = out + "\n" out = out + data + "\n" - out = out + "-----END PGP %s-----\n" % type + out = out + "-----END PGP %s-----\n" % type_ return out # vim: se ts=3: Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/caps.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -89,10 +89,10 @@ # TODO: maybe put all known xmpp namespace strings here # (strings given in xmpppy)? __names = {} - def __init__(ciself, hash_method, hash): + def __init__(ciself, hash_method, hash_): # cached into db ciself.hash_method = hash_method - ciself.hash = hash + ciself.hash = hash_ ciself._features = [] ciself._identities = [] @@ -174,14 +174,14 @@ self.__cache[(hash_method, hash)] = x return x - def preload(self, con, jid, node, hash_method, hash): + def preload(self, con, jid, node, hash_method, hash_): ''' Preload data about (node, ver, exts) caps using disco query to jid using proper connection. Don't query if the data is already in cache. ''' if hash_method == 'old': - q = self[(hash_method, node + '#' + hash)] + q = self[(hash_method, node + '#' + hash_)] else: - q = self[(hash_method, hash)] + q = self[(hash_method, hash_)] if q.queried==0: # do query for bare node+hash pair @@ -190,7 +190,7 @@ if hash_method == 'old': con.discoverInfo(jid) else: - con.discoverInfo(jid, '%s#%s' % (node, hash)) + con.discoverInfo(jid, '%s#%s' % (node, hash_)) def is_supported(self, contact, feature): if not contact: Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/commands.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -271,7 +271,7 @@ for jid in events: for event in events[jid]: self.connection.send_message(j, event.parameters[0], '', - type=event.type_, subject=event.parameters[1], + type_=event.type_, subject=event.parameters[1], resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/config.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -502,17 +502,17 @@ def is_valid_string(self, val): return val - def is_valid(self, type, val): - if not type: + def is_valid(self, type_, val): + if not type_: return None - if type[0] == 'boolean': + if type_[0] == 'boolean': return self.is_valid_bool(val) - elif type[0] == 'integer': + elif type_[0] == 'integer': return self.is_valid_int(val) - elif type[0] == 'string': + elif type_[0] == 'string': return self.is_valid_string(val) else: - if re.match(type[1], val): + if re.match(type_[1], val): return val else: return None Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/connection.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -1071,7 +1071,7 @@ self.connection.send(msg_iq) - def send_message(self, jid, msg, keyID, type='chat', subject='', + def send_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, original_message=None, delayed=None): @@ -1114,8 +1114,8 @@ 'rst_formatting_outgoing_messages'): # Generate a XHTML part using reStructured text markup xhtml = create_xhtml(msgtxt) - if type == 'chat': - msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type, + if type_ == 'chat': + msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_, xhtml = xhtml) else: if subject: @@ -1210,7 +1210,7 @@ log_msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': subject, 'message': msg} if log_msg: - if type == 'chat': + if type_ == 'chat': kind = 'chat_msg_sent' else: kind = 'single_msg_sent' Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/connection_handlers.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -1280,7 +1280,7 @@ return session if pm: - return self.make_new_session(fjid, thread_id, type='pm') + return self.make_new_session(fjid, thread_id, type_='pm') else: return self.make_new_session(fjid, thread_id) @@ -1349,15 +1349,15 @@ except (KeyError, IndexError): return None - def make_new_session(self, jid, thread_id=None, type='chat', cls=None): + def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): if not cls: cls = gajim.default_session_type - sess = cls(self, common.xmpp.JID(jid), thread_id, type) + sess = cls(self, common.xmpp.JID(jid), thread_id, type_) # determine if this session is a pm session # if not, discard the resource so that all sessions are stored bare - if not type == 'pm': + if not type_ == 'pm': jid = gajim.get_jid_without_resource(jid) if not jid in self.sessions: Modified: trunk/src/common/crypto.py =================================================================== --- trunk/src/common/crypto.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/crypto.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -75,8 +75,8 @@ else: return base28_chr[n] -def random_bytes(bytes): - return os.urandom(bytes) +def random_bytes(bytes_): + return os.urandom(bytes_) def generate_nonce(): return random_bytes(8) Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/dataforms.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -351,12 +351,12 @@ return self.vars[item] class DataForm(ExtendedNode): - def __init__(self, type=None, title=None, instructions=None, extend=None): + def __init__(self, type_=None, title=None, instructions=None, extend=None): if extend is None: # we have to build form from scratch xmpp.Node.__init__(self, 'x', attrs={'xmlns': xmpp.NS_DATA}) - if type is not None: self.type=type + if type_ is not None: self.type_=type_ if title is not None: self.title=title if instructions is not None: self.instructions=instructions @@ -367,9 +367,9 @@ filledform = DataForm(replyto=thisform)...''' def fget(self): return self.getAttr('type') - def fset(self, type): - assert type in ('form', 'submit', 'cancel', 'result') - self.setAttr('type', type) + def fset(self, type_): + assert type_ in ('form', 'submit', 'cancel', 'result') + self.setAttr('type', type_) return locals() @nested_property @@ -406,8 +406,8 @@ return locals() class SimpleDataForm(DataForm, DataRecord): - def __init__(self, type=None, title=None, instructions=None, fields=None, extend=None): - DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend) + def __init__(self, type_=None, title=None, instructions=None, fields=None, extend=None): + DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend) DataRecord.__init__(self, fields=fields, extend=self, associated=self) def get_purged(self): @@ -430,8 +430,8 @@ return c class MultipleDataForm(DataForm): - def __init__(self, type=None, title=None, instructions=None, items=None, extend=None): - DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend) + def __init__(self, type_=None, title=None, instructions=None, items=None, extend=None): + DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend) # all records, recorded into DataRecords if extend is None: Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/helpers.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -852,7 +852,7 @@ return filename -def allow_showing_notification(account, type = 'notify_on_new_message', +def allow_showing_notification(account, type_ = 'notify_on_new_message', advanced_notif_num = None, is_first_message = True): '''is it allowed to show nofication? check OUR status and if we allow notifications for that status @@ -865,7 +865,7 @@ return True if popup == 'no': return False - if type and (not gajim.config.get(type) or not is_first_message): + if type_ and (not gajim.config.get(type_) or not is_first_message): return False if gajim.config.get('autopopupaway'): # always show notification return True Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/logger.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -749,7 +749,7 @@ sql = 'DELETE FROM caps_cache WHERE hash_method = "%s" AND hash = "%s"' % (hash_method, hash) self.simple_commit(sql) - def add_caps_entry(self, hash_method, hash, identities, features): + def add_caps_entry(self, hash_method, hash_, identities, features): data=[] for identity in identities: # there is no FEAT category @@ -770,7 +770,7 @@ self.cur.execute(''' INSERT INTO caps_cache ( hash_method, hash, data ) VALUES (?, ?, ?); - ''', (hash_method, hash, buffer(data))) # (1) -- note above + ''', (hash_method, hash_, buffer(data))) # (1) -- note above try: self.con.commit() except sqlite.OperationalError, e: Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/nslookup.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -280,11 +280,11 @@ self._return_result() class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type = 'srv'): + 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() + self.type = type_.lower() if not host_pattern.match(self.host): # invalid host name print >> sys.stderr, 'Invalid host: %s' % self.host Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/pubsub.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -58,21 +58,21 @@ self.__callbacks[id]=(cb, args, kwargs) - def send_pb_publish(self, jid, node, item, id): + def send_pb_publish(self, jid, node, item, id_): '''Publish item to a node.''' query = xmpp.Iq('set', to=jid) e = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) e = e.addChild('publish', {'node': node}) - e = e.addChild('item', {'id': id}, [item]) # TODO: we should generate id... or we shouldn't? + e = e.addChild('item', {'id': id_}, [item]) # TODO: we should generate id... or we shouldn't? self.connection.send(query) - def send_pb_retract(self, jid, node, id): + def send_pb_retract(self, jid, node, id_): '''Delete item from a node''' query = xmpp.Iq('set', to=jid) r = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) r = r.addChild('retract', {'node': node, 'notify': '1'}) - r = r.addChild('item', {'id': id}) + r = r.addChild('item', {'id': id_}) self.connection.send(query) Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/stanza_session.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -41,19 +41,19 @@ XmlDsig = 'http://www.w3.org/2000/09/xmldsig#' class StanzaSession(object): - def __init__(self, conn, jid, thread_id, type): + def __init__(self, conn, jid, thread_id, type_): self.conn = conn self.jid = jid - self.type = type + self.type = type_ if thread_id: self.received_thread_id = True self.thread_id = thread_id else: self.received_thread_id = False - if type == 'normal': + if type_ == 'normal': self.thread_id = None else: self.thread_id = self.generate_thread_id() @@ -189,8 +189,8 @@ # handle_session_negotiation method. class EncryptedStanzaSession(StanzaSession): - def __init__(self, conn, jid, thread_id, type='chat'): - StanzaSession.__init__(self, conn, jid, thread_id, type='chat') + def __init__(self, conn, jid, thread_id, type_='chat'): + StanzaSession.__init__(self, conn, jid, thread_id, type_='chat') self.xes = {} self.es = {} Modified: trunk/src/common/xmpp/browser.py =================================================================== --- trunk/src/common/xmpp/browser.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/xmpp/browser.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -96,7 +96,7 @@ self._owner.UnregisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_INFO) self._owner.UnregisterHandler('iq',self._DiscoveryHandler,typ='get',ns=NS_DISCO_ITEMS) - def _traversePath(self,node,jid,set=0): + def _traversePath(self,node,jid,set_=0): """ Returns dictionary and key or None,None None - root node (w/o "node" attribute) /a/b/c - node @@ -105,7 +105,7 @@ get returns '' or None as the key or None as the dict. Used internally.""" if jid in self._handlers: cur=self._handlers[jid] - elif set: + elif set_: self._handlers[jid]={} cur=self._handlers[jid] else: cur=self._handlers[''] @@ -113,10 +113,10 @@ else: node=node.replace('/',' /').split('/') for i in node: if i!='' and i in cur: cur=cur[i] - elif set and i!='': cur[i]={dict:cur,str:i}; cur=cur[i] - elif set or '' in cur: return cur,'' + elif set_ and i!='': cur[i]={dict:cur,str:i}; cur=cur[i] + elif set_ or '' in cur: return cur,'' else: return None,None - if 1 in cur or set: return cur,1 + if 1 in cur or set_: return cur,1 raise "Corrupted data" def setDiscoHandler(self,handler,node='',jid=''): Modified: trunk/src/common/xmpp/commands.py =================================================================== --- trunk/src/common/xmpp/commands.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/xmpp/commands.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -251,13 +251,13 @@ # New session self.initial[action](conn,request) - def _DiscoHandler(self,conn,request,type): + def _DiscoHandler(self,conn,request,type_): """The handler for discovery events""" - if type == 'list': + if type_ == 'list': return (request.getTo(),self.name,self.description) - elif type == 'items': + elif type_ == 'items': return [] - elif type == 'info': + elif type_ == 'info': return self.discoinfo class TestCommand(Command_Handler_Prototype): Modified: trunk/src/common/xmpp/features.py =================================================================== --- trunk/src/common/xmpp/features.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/xmpp/features.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -171,11 +171,11 @@ """ Sets the default privacy list as 'listname'. Returns true on success.""" return setActivePrivacyList(disp,listname,'default') -def setPrivacyList(disp,list): +def setPrivacyList(disp,list_): """ Set the ruleset. 'list' should be the simpleXML node formatted according to RFC 3921 (XMPP-IM) (I.e. Node('list',{'name':listname},payload=[...]) ) Returns true on success.""" - resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[list])) + resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[list_])) if isResultNode(resp): return 1 def delPrivacyList(disp,listname): Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -360,7 +360,7 @@ def get_status(self): return STATUS_LIST[self.connected] - def send_message(self, jid, msg, keyID, type = 'chat', subject='', + def send_message(self, jid, msg, keyID, type_ = 'chat', subject='', chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None, session=None, forward_from=None, form_node=None, original_message=None): fjid = jid @@ -396,8 +396,8 @@ self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) return 3 - if type == 'chat': - msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type) + if type_ == 'chat': + msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_) else: if subject: @@ -445,7 +445,7 @@ log_msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': subject, 'message': msg} if log_msg: - if type == 'chat': + if type_ == 'chat': kind = 'chat_msg_sent' else: kind = 'single_msg_sent' Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/config.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -759,12 +759,12 @@ [self.xml.get_widget('sounds_scrolledwindow'), self.xml.get_widget('browse_sounds_hbox')]) - def on_sounds_treemodel_row_changed(self, model, path, iter): - sound_event = model[iter][3].decode('utf-8') + def on_sounds_treemodel_row_changed(self, model, path, iter_): + sound_event = model[iter_][3].decode('utf-8') gajim.config.set_per('soundevents', sound_event, 'enabled', bool(model[path][0])) gajim.config.set_per('soundevents', sound_event, 'path', - model[iter][2].decode('utf-8')) + model[iter_][2].decode('utf-8')) gajim.interface.save_config() def update_text_tags(self): @@ -891,11 +891,11 @@ model = self.default_msg_tree.get_model() model[path][3] = not model[path][3] - def on_default_msg_treemodel_row_changed(self, model, path, iter): - status = model[iter][0] - message = model[iter][2].decode('utf-8') + def on_default_msg_treemodel_row_changed(self, model, path, iter_): + status = model[iter_][0] + message = model[iter_][2].decode('utf-8') gajim.config.set_per('defaultstatusmsg', status, 'enabled', - model[iter][3]) + model[iter_][3]) gajim.config.set_per('defaultstatusmsg', status, 'message', message) def on_default_status_expander_activate(self, expander): @@ -919,7 +919,7 @@ iter = model.iter_next(iter) gajim.interface.save_config() - def on_msg_treemodel_row_changed(self, model, path, iter): + def on_msg_treemodel_row_changed(self, model, path, iter_): self.save_status_messages(model) def on_msg_treemodel_row_deleted(self, model, path): Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/conversation_textview.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -408,53 +408,53 @@ self.smooth_id = None self.smooth_scroll_timer.cancel() - def show_xep0184_warning(self, id): - if id in self.xep0184_marks: + def show_xep0184_warning(self, id_): + if id_ in self.xep0184_marks: return buffer = self.tv.get_buffer() buffer.begin_user_action() - self.xep0184_marks[id] = buffer.create_mark(None, + self.xep0184_marks[id_] = buffer.create_mark(None, buffer.get_end_iter(), left_gravity=True) - self.xep0184_shown[id] = NOT_SHOWN + self.xep0184_shown[id_] = NOT_SHOWN def show_it(): - if (not id in self.xep0184_shown) or \ - self.xep0184_shown[id] == ALREADY_RECEIVED: + if (not id_ in self.xep0184_shown) or \ + self.xep0184_shown[id_] == ALREADY_RECEIVED: return False end_iter = buffer.get_iter_at_mark( - self.xep0184_marks[id]) + self.xep0184_marks[id_]) buffer.insert(end_iter, ' ') buffer.insert_pixbuf(end_iter, ConversationTextview.XEP0184_WARNING_PIXBUF) before_img_iter = buffer.get_iter_at_mark( - self.xep0184_marks[id]) + self.xep0184_marks[id_]) before_img_iter.forward_char() post_img_iter = before_img_iter.copy() post_img_iter.forward_char() buffer.apply_tag_by_name('xep0184-warning', before_img_iter, post_img_iter) - self.xep0184_shown[id] = SHOWN + self.xep0184_shown[id_] = SHOWN return False gobject.timeout_add_seconds(2, show_it) buffer.end_user_action() - def hide_xep0184_warning(self, id): - if id not in self.xep0184_marks: + def hide_xep0184_warning(self, id_): + if id_ not in self.xep0184_marks: return - if self.xep0184_shown[id] == NOT_SHOWN: - self.xep0184_shown[id] = ALREADY_RECEIVED + if self.xep0184_shown[id_] == NOT_SHOWN: + self.xep0184_shown[id_] = ALREADY_RECEIVED return buffer = self.tv.get_buffer() buffer.begin_user_action() - begin_iter = buffer.get_iter_at_mark(self.xep0184_marks[id]) + begin_iter = buffer.get_iter_at_mark(self.xep0184_marks[id_]) end_iter = begin_iter.copy() # XXX: Is there a nicer way? @@ -462,12 +462,12 @@ end_iter.forward_char() buffer.delete(begin_iter, end_iter) - buffer.delete_mark(self.xep0184_marks[id]) + buffer.delete_mark(self.xep0184_marks[id_]) buffer.end_user_action() - del self.xep0184_marks[id] - del self.xep0184_shown[id] + del self.xep0184_marks[id_] + del self.xep0184_shown[id_] def show_focus_out_line(self): if not self.allow_focus_out_line: @@ -859,13 +859,13 @@ menu.popup(None, None, None, event.button, event.time) - def hyperlink_handler(self, texttag, widget, event, iter, kind): + def hyperlink_handler(self, texttag, widget, event, iter_, kind): if event.type == gtk.gdk.BUTTON_PRESS: - begin_iter = iter.copy() + begin_iter = iter_.copy() # we get the begining of the tag while not begin_iter.begins_tag(texttag): begin_iter.backward_char() - end_iter = iter.copy() + end_iter = iter_.copy() # we get the end of the tag while not end_iter.ends_tag(texttag): end_iter.forward_char() @@ -877,7 +877,7 @@ # we launch the correct application helpers.launch_browser_mailer(kind, word) - def html_hyperlink_handler(self, texttag, widget, event, iter, kind, href): + def html_hyperlink_handler(self, texttag, widget, event, iter_, kind, href): if event.type == gtk.gdk.BUTTON_PRESS: if event.button == 3: # right click self.make_link_menu(event, kind, href) @@ -922,7 +922,7 @@ return index # the position after *last* special text - def latex_to_image(self, str): + def latex_to_image(self, str_): result = None exitcode = 0 @@ -938,11 +938,11 @@ '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[', '\\]'] - str = str[2:len(str)-2] + str_ = str_[2:len(str_)-2] # filter latex code with bad commands for word in blacklist: - if word in str: + if word in str_: exitcode = 1 break @@ -956,7 +956,7 @@ texstr += '\\usepackage{amsmath}\\usepackage{amssymb}' texstr += '\\pagestyle{empty}' texstr += '\\begin{document}\\begin{large}\\begin{gather*}' - texstr += str + texstr += str_ texstr += '\\end{gather*}\\end{large}\\end{document}' file = open(os.path.join(tmpfile + '.tex'), 'w+') Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/dataforms_widget.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -570,9 +570,9 @@ model = treeview.get_model() deleted = [] - def remove(model, path, iter, deleted): - deleted+=model[iter] - model.remove(iter) + def remove(model, path, iter_, deleted): + deleted+=model[iter_] + model.remove(iter_) selection.selected_foreach(remove, deleted) field.values = (v for v in field.values if v not in deleted) Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/dialogs.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -309,12 +309,12 @@ self.on_response(keyID) self.window.destroy() - def fill_tree(self, list, selected): + def fill_tree(self, list_, selected): model = self.keys_treeview.get_model() - for keyID in list.keys(): - iter = model.append((keyID, list[keyID])) + for keyID in list_.keys(): + iter_ = model.append((keyID, list_[keyID])) if keyID == selected: - path = model.get_path(iter) + path = model.get_path(iter_) self.keys_treeview.set_cursor(path) @@ -1104,12 +1104,12 @@ class HigDialog(gtk.MessageDialog): - def __init__(self, parent, type, buttons, pritext, sectext, + def __init__(self, parent, type_, buttons, pritext, sectext, on_response_ok = None, on_response_cancel = None, on_response_yes = None, on_response_no = None): gtk.MessageDialog.__init__(self, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, - type, buttons, message_format = pritext) + type_, buttons, message_format = pritext) self.format_secondary_markup(sectext) @@ -2364,7 +2364,7 @@ form_node = None # FIXME: allow GPG message some day gajim.connections[self.account].send_message(to_whom_jid, message, - keyID=None, type='normal', subject=subject, session=session, + keyID=None, type_='normal', subject=subject, session=session, form_node=form_node) self.subject_entry.set_text('') # we sent ok, clear the subject Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/disco.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -240,9 +240,9 @@ self._items.cleanup() self._info.cleanup() - def _clean_closure(self, cb, type, addr): + def _clean_closure(self, cb, type_, addr): # A closure died, clean up - cbkey = (type, addr) + cbkey = (type_, addr) try: self._cbs[cbkey].remove(cb) except KeyError: @@ -989,20 +989,20 @@ get_agent_address(jid, node))) self.cache.get_info(jid, node, self._agent_info, force = force) - def _update_item(self, iter, jid, node, item): + def _update_item(self, iter_, jid, node, item): '''Called when an item should be updated in the model. The result of a disco#items query. (seldom)''' if 'name' in item: - self.model[iter][2] = item['name'] + self.model[iter_][2] = item['name'] - def _update_info(self, iter, jid, node, identities, features, data): + def _update_info(self, iter_, jid, node, identities, features, data): '''Called when an item should be updated in the model with further info. The result of a disco#info query.''' name = identities[0].get('name', '') if name: - self.model[iter][2] = name + self.model[iter_][2] = name - def _update_error(self, iter, jid, node): + def _update_error(self, iter_, jid, node): '''Called when a disco#info query failed for an item.''' pass @@ -1024,21 +1024,21 @@ self._view_signals = [] self._scroll_signal = None - def _pixbuf_renderer_data_func(self, col, cell, model, iter): + def _pixbuf_renderer_data_func(self, col, cell, model, iter_): '''Callback for setting the pixbuf renderer's properties.''' - jid = model.get_value(iter, 0) + jid = model.get_value(iter_, 0) if jid: - pix = model.get_value(iter, 2) + pix = model.get_value(iter_, 2) cell.set_property('visible', True) cell.set_property('pixbuf', pix) else: cell.set_property('visible', False) - def _text_renderer_data_func(self, col, cell, model, iter): + def _text_renderer_data_func(self, col, cell, model, iter_): '''Callback for setting the text renderer's properties.''' - jid = model.get_value(iter, 0) - markup = model.get_value(iter, 3) - state = model.get_value(iter, 4) + jid = model.get_value(iter_, 0) + markup = model.get_value(iter_, 3) + state = model.get_value(iter_, 4) cell.set_property('markup', markup) if jid: cell.set_property('cell_background_set', False) @@ -1407,13 +1407,13 @@ self.window.progressbar.hide() return False - def _friendly_category(self, category, type=None): + def _friendly_category(self, category, type_=None): '''Get the friendly category name and priority.''' cat = None - if type: + if type_: # Try type-specific override try: - cat, prio = _cat_to_descr[(category, type)] + cat, prio = _cat_to_descr[(category, type_)] except KeyError: pass if not cat: @@ -1423,14 +1423,14 @@ cat, prio = _cat_to_descr['other'] return cat, prio - def _create_category(self, cat, type=None): + def _create_category(self, cat, type_=None): '''Creates a category row.''' - cat, prio = self._friendly_category(cat, type) + cat, prio = self._friendly_category(cat, type_) return self.model.append(None, ('', '', None, cat, prio)) - def _find_category(self, cat, type=None): + def _find_category(self, cat, type_=None): '''Looks up a category row and returns the iterator to it, or None.''' - cat, prio = self._friendly_category(cat, type) + cat, prio = self._friendly_category(cat, type_) iter = self.model.get_iter_root() while iter: if self.model.get_value(iter, 3).decode('utf-8') == cat: @@ -1486,15 +1486,15 @@ self.cache.get_info(jid, node, self._agent_info, force = force) self._update_progressbar() - def _update_item(self, iter, jid, node, item): + def _update_item(self, iter_, jid, node, item): addr = get_agent_address(jid, node) if 'name' in item: descr = "%s\n%s" % (item['name'], addr) else: descr = "%s" % addr - self.model[iter][3] = descr + self.model[iter_][3] = descr - def _update_info(self, iter, jid, node, identities, features, data): + def _update_info(self, iter_, jid, node, identities, features, data): addr = get_agent_address(jid, node) name = identities[0].get('name', '') if name: @@ -1516,16 +1516,16 @@ break # Check if we have to move categories - old_cat_iter = self.model.iter_parent(iter) + old_cat_iter = self.model.iter_parent(iter_) old_cat = self.model.get_value(old_cat_iter, 3).decode('utf-8') if self.model.get_value(old_cat_iter, 3) == cat: # Already in the right category, just update - self.model[iter][2] = pix - self.model[iter][3] = descr - self.model[iter][4] = 0 + self.model[iter_][2] = pix + self.model[iter_][3] = descr + self.model[iter_][4] = 0 return # Not in the right category, move it. - self.model.remove(iter) + self.model.remove(iter_) # Check if the old category is empty if not self.model.iter_is_valid(old_cat_iter): @@ -1539,9 +1539,9 @@ self.model.append(cat_iter, (jid, node, pix, descr, 0)) self._expand_all() - def _update_error(self, iter, jid, node): + def _update_error(self, iter_, jid, node): addr = get_agent_address(jid, node) - self.model[iter][4] = 2 + self.model[iter_][4] = 2 self._progress += 1 self._update_progressbar() @@ -1738,7 +1738,7 @@ if not self._fetch_source: self._fetch_source = gobject.idle_add(self._start_info_query) - def _update_info(self, iter, jid, node, identities, features, data): + def _update_info(self, iter_, jid, node, identities, features, data): name = identities[0].get('name', '') for form in data: typefield = form.getField('FORM_TYPE') @@ -1748,15 +1748,15 @@ users = form.getField('muc#roominfo_occupants') descr = form.getField('muc#roominfo_description') if users: - self.model[iter][3] = int(users.getValue()) - self.model[iter][4] = users.getValue() + self.model[iter_][3] = int(users.getValue()) + self.model[iter_][4] = users.getValue() if descr: - self.model[iter][5] = descr.getValue() + self.model[iter_][5] = descr.getValue() # Only set these when we find a form with additional info # Some servers don't support forms and put extra info in # the name attribute, so we preserve it in that case. - self.model[iter][2] = name - self.model[iter][6] = True + self.model[iter_][2] = name + self.model[iter_][6] = True break else: # We didn't find a form, switch to alternate query mode @@ -1766,7 +1766,7 @@ self._fetch_source = None self._query_visible() - def _update_error(self, iter, jid, node): + def _update_error(self, iter_, jid, node): # switch to alternate query mode self.cache.get_items(jid, node, self._channel_altinfo) @@ -1836,7 +1836,7 @@ self._total_items += 1 self._add_item(jid, node, item, force) - def _in_list_foreach(self, model, path, iter, node): + def _in_list_foreach(self, model, path, iter_, node): if model[path][1] == node: self.in_list = True Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/filetransfers_window.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -458,8 +458,8 @@ eta = remaining_size / speed return eta, speed - def _remove_transfer(self, iter, sid, file_props): - self.model.remove(iter) + def _remove_transfer(self, iter_, sid, file_props): + self.model.remove(iter_) if 'tt_account' in file_props: # file transfer is set account = file_props['tt_account'] @@ -484,7 +484,7 @@ del(self.files_props[sid[0]][sid[1:]]) del(file_props) - def set_progress(self, typ, sid, transfered_size, iter = None): + def set_progress(self, typ, sid, transfered_size, iter_ = None): ''' change the progress of a transfer with new transfered size''' if sid not in self.files_props[typ]: return @@ -494,11 +494,11 @@ percent = 0 else: percent = round(float(transfered_size) / full_size * 100, 1) - if iter is None: - iter = self.get_iter_by_sid(typ, sid) - if iter is not None: + if iter_ is None: + iter_ = self.get_iter_by_sid(typ, sid) + if iter_ is not None: just_began = False - if self.model[iter][C_PERCENT] == 0 and int(percent > 0): + if self.model[iter_][C_PERCENT] == 0 and int(percent > 0): just_began = True text = self._format_percent(percent) if transfered_size == 0: @@ -520,8 +520,8 @@ eta, speed = self._get_eta_and_speed(full_size, transfered_size, file_props) - self.model.set(iter, C_PROGRESS, text) - self.model.set(iter, C_PERCENT, int(percent)) + self.model.set(iter_, C_PROGRESS, text) + self.model.set(iter_, C_PERCENT, int(percent)) text = self._format_time(eta) text += '\n' #This should make the string Kb/s, @@ -529,7 +529,7 @@ #Only the 's' after / (which means second) should be translated. text += _('(%(filesize_unit)s/s)') % {'filesize_unit': helpers.convert_bytes(speed)} - self.model.set(iter, C_TIME, text) + self.model.set(iter_, C_TIME, text) # try to guess what should be the status image if file_props['type'] == 'r': @@ -542,11 +542,11 @@ status = 'waiting' if 'connected' in file_props and file_props['connected'] == False: status = 'stop' - self.model.set(iter, 0, self.images[status]) + self.model.set(iter_, 0, self.images[status]) if transfered_size == full_size: self.set_status(typ, sid, 'ok') elif just_began: - path = self.model.get_path(iter) + path = self.model.get_path(iter_) self.select_func(path) def get_iter_by_sid(self, typ, sid): @@ -873,11 +873,11 @@ def on_close_button_clicked(self, widget): self.window.hide() - def show_context_menu(self, event, iter): + def show_context_menu(self, event, iter_): # change the sensitive propery of the buttons and menuitems path = None - if iter is not None: - path = self.model.get_path(iter) + if iter_ is not None: + path = self.model.get_path(iter_) self.set_buttons_sensitive(path, True) event_button = gtkgui_helpers.get_possible_button_event(event) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/gajim.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -2307,7 +2307,8 @@ room_jid = room_jid, name = nick, show = show) if not session: - session = gajim.connections[account].make_new_session(fjid, None, type='pm') + session = gajim.connections[account].make_new_session( + fjid, None, type_='pm') self.new_private_chat(gc_contact, account, session=session) ctrl = session.control Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/groupchat_control.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -66,19 +66,19 @@ fgcolor = treeview.style.fg[gtk.STATE_PRELIGHT] renderer.set_property('foreground-gdk', fgcolor) -def tree_cell_data_func(column, renderer, model, iter, tv=None): +def tree_cell_data_func(column, renderer, model, iter_, tv=None): # cell data func is global, because we don't want it to keep # reference to GroupchatControl instance (self) theme = gajim.config.get('roster_theme') # allocate space for avatar only if needed - parent_iter = model.iter_parent(iter) + parent_iter = model.iter_parent(iter_) if isinstance(renderer, gtk.CellRendererPixbuf): avatar_position = gajim.config.get('avatar_position_in_roster') if avatar_position == 'right': renderer.set_property('xalign', 1) # align pixbuf to the right else: renderer.set_property('xalign', 0.5) - if parent_iter and (model[iter][C_AVATAR] or avatar_position == 'left'): + if parent_iter and (model[iter_][C_AVATAR] or avatar_position == 'left'): renderer.set_property('visible', True) renderer.set_property('width', gajim.config.get('roster_avatar_width')) else: @@ -541,8 +541,8 @@ for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): self.draw_contact(nick) - def _change_style(self, model, path, iter): - model[iter][C_NICK] = model[iter][C_NICK] + def _change_style(self, model, path, iter_): + model[iter_][C_NICK] = model[iter_][C_NICK] def change_roster_style(self): model = self.list_treeview.get_model() @@ -982,12 +982,12 @@ # Recalculate column width for ellipsizin self.list_treeview.columns_autosize() - def on_send_pm(self, widget=None, model=None, iter=None, nick=None, + def on_send_pm(self, widget=None, model=None, iter_=None, nick=None, msg=None): '''opens a chat window and if msg is not None sends private message to a contact in a room''' if nick is None: - nick = model[iter][C_NICK].decode('utf-8') + nick = model[iter_][C_NICK].decode('utf-8') fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid ctrl = self._start_private_message(nick) @@ -2040,17 +2040,17 @@ widget.get_selection().unselect_all() return True - def on_list_treeview_row_expanded(self, widget, iter, path): + def on_list_treeview_row_expanded(self, widget, iter_, path): '''When a row is expanded: change the icon of the arrow''' model = widget.get_model() image = gajim.interface.jabber_state_images['16']['opened'] - model[iter][C_IMG] = image + model[iter_][C_IMG] = image - def on_list_treeview_row_collapsed(self, widget, iter, path): + def on_list_treeview_row_collapsed(self, widget, iter_, path): '''When a row is collapsed: change the icon of the arrow''' model = widget.get_model() image = gajim.interface.jabber_state_images['16']['closed'] - model[iter][C_IMG] = image + model[iter_][C_IMG] = image def kick(self, widget, nick): '''kick a user''' @@ -2062,10 +2062,10 @@ instance = dialogs.InputDialog(_('Kicking %s') % nick, _('You may specify a reason below:'), ok_handler=on_ok) - def mk_menu(self, event, iter): + def mk_menu(self, event, iter_): '''Make contact's popup menu''' model = self.list_treeview.get_model() - nick = model[iter][C_NICK].decode('utf-8') + nick = model[iter_][C_NICK].decode('utf-8') c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) jid = c.jid target_affiliation = c.affiliation @@ -2159,7 +2159,7 @@ self.handlers[id] = item item = xml.get_widget('send_private_message_menuitem') - id = item.connect('activate', self.on_send_pm, model, iter) + id = item.connect('activate', self.on_send_pm, model, iter_) self.handlers[id] = item item = xml.get_widget('send_file_menuitem') Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/gtkexcepthook.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -35,11 +35,11 @@ _exception_in_progress = threading.Lock() -def _info(type, value, tb): +def _info(type_, value, tb): if not _exception_in_progress.acquire(False): # Exceptions have piled up, so we use the default exception # handler for such exceptions - _excepthook_save(type, value, tb) + _excepthook_save(type_, value, tb) return dialog = dialogs.HigDialog(None, gtk.MESSAGE_WARNING, gtk.BUTTONS_NONE, @@ -69,7 +69,7 @@ frame.set_border_width(6) textbuffer = textview.get_buffer() trace = StringIO() - traceback.print_exception(type, value, tb, None, trace) + traceback.print_exception(type_, value, tb, None, trace) textbuffer.set_text(trace.getvalue()) textview.set_size_request( gtk.gdk.screen_width() / 3, Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/gtkgui_helpers.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -273,10 +273,10 @@ self.algo = self.cleanID(algo) self.digest = self.cleanID(digest) - def cleanID(self, id): - id = id.strip().lower() - for strip in (' :.-_'): id = id.replace(strip, '') - return id + def cleanID(self, id_): + id_ = id_.strip().lower() + for strip in (' :.-_'): id_ = id_.replace(strip, '') + return id_ def __eq__(self, other): sa, sd = self.algo, self.digest Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/htmltextview.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -728,7 +728,7 @@ else: self._insert_text(text.strip('\n')) - def _anchor_event(self, tag, textview, event, iter, href, type_): + def _anchor_event(self, tag, textview, event, iter_, href, type_): if event.type == gtk.gdk.BUTTON_PRESS: self.textview.emit('url-clicked', href, type_) return True @@ -1068,7 +1068,7 @@ htmlview.connect('motion_notify_event', on_textview_motion_notify_event) - def handler(texttag, widget, event, iter, kind, href): + def handler(texttag, widget, event, iter_, kind, href): if event.type == gtk.gdk.BUTTON_PRESS: print href Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/message_control.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -160,7 +160,7 @@ if crypto_changed: self.print_esession_details() - def send_message(self, message, keyID = '', type = 'chat', + def send_message(self, message, keyID = '', type_ = 'chat', chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None): # Send the given message to the active tab. @@ -184,7 +184,7 @@ self.set_session(sess) # Send and update history - return conn.send_message(jid, message, keyID, type = type, + return conn.send_message(jid, message, keyID, type_ = type_, chatstate = chatstate, msg_id = msg_id, composing_xep = composing_xep, resource = self.resource, user_nick = user_nick, Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/message_window.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -55,7 +55,7 @@ CLOSE_CTRL_KEY ) = range(5) - def __init__(self, acct, type, parent_window=None, parent_paned=None): + def __init__(self, acct, type_, parent_window=None, parent_paned=None): # A dictionary of dictionaries # where _contacts[account][jid] == A MessageControl self._controls = {} @@ -63,7 +63,7 @@ # If None, the window is not tied to any specific account self.account = acct # If None, the window is not tied to any specific type - self.type = type + self.type_ = type_ # dict { handler id: widget}. Keeps callbacks, which # lead to cylcular references self.handlers = {} @@ -773,7 +773,7 @@ selection.set(selection.target, 8, str(source_page_num)) def on_tab_label_drag_data_received_cb(self, widget, drag_context, x, y, - selection, type, time): + selection, type_, time): '''Reorder the tabs according to the drop position''' source_page_num = int(selection.data) dest_page_num, to_right = self.get_tab_at_xy(x, y) @@ -869,13 +869,13 @@ for win in self.windows(): win.change_account_name(old_name, new_name) - def _new_window(self, acct, type): + def _new_window(self, acct, type_): parent_win = None parent_paned = None if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: parent_win = self.parent_win parent_paned = self.parent_paned - win = MessageWindow(acct, type, parent_win, parent_paned) + win = MessageWindow(acct, type_, parent_win, parent_paned) # we track the lifetime of this window win.window.connect('delete-event', self._on_window_delete) win.window.connect('destroy', self._on_window_destroy) @@ -897,14 +897,14 @@ def has_window(self, jid, acct): return self.get_window(jid, acct) is not None - def one_window_opened(self, contact=None, acct=None, type=None): + def one_window_opened(self, contact=None, acct=None, type_=None): try: return \ - self._windows[self._mode_to_key(contact, acct, type)] is not None + self._windows[self._mode_to_key(contact, acct, type_)] is not None except KeyError: return False - def _resize_window(self, win, acct, type): + def _resize_window(self, win, acct, type_): '''Resizes window according to config settings''' if self.mode in (self.ONE_MSG_WINDOW_ALWAYS, self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER): @@ -920,10 +920,10 @@ size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE): - if type == message_control.TYPE_PM: - type = message_control.TYPE_CHAT - opt_width = type + '-msgwin-width' - opt_height = type + '-msgwin-height' + if type_ == message_control.TYPE_PM: + type_ = message_control.TYPE_CHAT + opt_width = type_ + '-msgwin-width' + opt_height = type_ + '-msgwin-height' size = (gajim.config.get(opt_width), gajim.config.get(opt_height)) else: return @@ -931,7 +931,7 @@ if win.parent_paned: win.parent_paned.set_position(parent_size[0]) - def _position_window(self, win, acct, type): + def _position_window(self, win, acct, type_): '''Moves window according to config settings''' if (self.mode in [self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]): @@ -944,14 +944,14 @@ pos = (gajim.config.get_per('accounts', acct, 'msgwin-x-position'), gajim.config.get_per('accounts', acct, 'msgwin-y-position')) elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - pos = (gajim.config.get(type + '-msgwin-x-position'), - gajim.config.get(type + '-msgwin-y-position')) + pos = (gajim.config.get(type_ + '-msgwin-x-position'), + gajim.config.get(type_ + '-msgwin-y-position')) else: return gtkgui_helpers.move_window(win.window, pos[0], pos[1]) - def _mode_to_key(self, contact, acct, type, resource = None): + def _mode_to_key(self, contact, acct, type_, resource = None): if self.mode == self.ONE_MSG_WINDOW_NEVER: key = acct + contact.jid if resource: @@ -964,22 +964,22 @@ elif self.mode == self.ONE_MSG_WINDOW_PERACCT: return acct elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - return type + return type_ - def create_window(self, contact, acct, type, resource = None): + def create_window(self, contact, acct, type_, resource = None): win_acct = None win_type = None win_role = None # X11 window role - win_key = self._mode_to_key(contact, acct, type, resource) + win_key = self._mode_to_key(contact, acct, type_, resource) if self.mode == self.ONE_MSG_WINDOW_PERACCT: win_acct = acct win_role = acct elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - win_type = type - win_role = type + win_type = type_ + win_role = type_ elif self.mode == self.ONE_MSG_WINDOW_NEVER: - win_type = type + win_type = type_ win_role = contact.jid elif self.mode == self.ONE_MSG_WINDOW_ALWAYS: win_role = 'messages' @@ -994,9 +994,9 @@ win.window.set_role(win_role) # Position and size window based on saved state and window mode - if not self.one_window_opened(contact, acct, type): - self._resize_window(win, acct, type) - self._position_window(win, acct, type) + if not self.one_window_opened(contact, acct, type_): + self._resize_window(win, acct, type_) + self._position_window(win, acct, type_) self._windows[win_key] = win return win @@ -1039,12 +1039,12 @@ return ctrl return None - def get_controls(self, type = None, acct = None): + def get_controls(self, type_ = None, acct = None): ctrls = [] for c in self.controls(): if acct and c.account != acct: continue - if not type or c.type_id == type: + if not type_ or c.type_id == type_: ctrls.append(c) return ctrls Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/notify.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -400,12 +400,12 @@ self.interface.connect_to_signal('ActionInvoked', self.on_action_invoked) self.interface.connect_to_signal('NotificationClosed', self.on_closed) - def on_action_invoked(self, id, reason): - self.received.append((id, time.time(), reason)) - if id in self.pending: - notification = self.pending[id] - notification.on_action_invoked(id, reason) - del self.pending[id] + def on_action_invoked(self, id_, reason): + self.received.append((id_, time.time(), reason)) + if id_ in self.pending: + notification = self.pending[id_] + notification.on_action_invoked(id_, reason) + del self.pending[id_] if len(self.received) > 20: curt = time.time() for rec in self.received: @@ -413,21 +413,21 @@ if diff > 10: self.received.remove(rec) - def on_closed(self, id, reason=None): - if id in self.pending: - del self.pending[id] + def on_closed(self, id_, reason=None): + if id_ in self.pending: + del self.pending[id_] - def add_pending(self, id, object): + def add_pending(self, id_, object_): # Check to make sure that we handle an event immediately if we're adding # an id that's already been triggered for rec in self.received: - if rec[0] == id: - object.on_action_invoked(id, rec[2]) + if rec[0] == id_: + object_.on_action_invoked(id_, rec[2]) self.received.remove(rec) return - if id not in self.pending: + if id_ not in self.pending: # Add it - self.pending[id] = object + self.pending[id_] = object_ else: # We've triggered an event that has a duplicate ID! gajim.log.debug('Duplicate ID of notification. Can\'t handle this.') @@ -553,8 +553,8 @@ reply_handler=self.attach_by_id, error_handler=self.notify_another_way) - def attach_by_id(self, id): - self.id = id + def attach_by_id(self, id_): + self.id = id_ notification_response_manager.attach_to_interface() notification_response_manager.add_pending(self.id, self) @@ -562,10 +562,10 @@ gajim.log.debug(str(e)) gajim.log.debug('Need to implement a new way of falling back') - def on_action_invoked(self, id, reason): + def on_action_invoked(self, id_, reason): if self.notif is None: return - self.notif.CloseNotification(dbus.UInt32(id)) + self.notif.CloseNotification(dbus.UInt32(id_)) self.notif = None gajim.interface.handle_event(self.account, self.jid, self.msg_type) Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/remote_control.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -279,7 +279,7 @@ return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) - def _send_message(self, jid, message, keyID, account, type = 'chat', + def _send_message(self, jid, message, keyID, account, type_ = 'chat', subject = None): '''can be called from send_chat_message (default when send_message) or send_single_message''' @@ -291,7 +291,7 @@ connected_account, contact = self._get_account_and_contact(account, jid) if connected_account: connection = gajim.connections[connected_account] - connection.send_message(jid, message, keyID, type, subject) + connection.send_message(jid, message, keyID, type_, subject) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/src/session.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -38,9 +38,9 @@ import negotiation class ChatControlSession(stanza_session.EncryptedStanzaSession): - def __init__(self, conn, jid, thread_id, type='chat'): + def __init__(self, conn, jid, thread_id, type_='chat'): stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, - type='chat') + type_='chat') self.control = None Modified: trunk/test/lib/mocks.py =================================================================== --- trunk/test/lib/mocks.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/test/lib/mocks.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -122,12 +122,12 @@ import random class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type): + def __init__(self, conn, jid, thread_id, type_): Mock.__init__(self) self.conn = conn self.jid = jid - self.type = type + self.type = type_ self.thread_id = thread_id if not self.thread_id: Modified: trunk/test/test_misc_interface.py =================================================================== --- trunk/test/test_misc_interface.py 2008-10-11 10:11:24 UTC (rev 10517) +++ trunk/test/test_misc_interface.py 2008-10-11 10:22:04 UTC (rev 10518) @@ -15,11 +15,11 @@ class TestMiscInterface(unittest.TestCase): def test_links_regexp_entire(self): - def assert_matches_all(str): - m = gajim.interface.basic_pattern_re.match(str) + def assert_matches_all(str_): + m = gajim.interface.basic_pattern_re.match(str_) # the match should equal the string - str_span = (0, len(str)) + str_span = (0, len(str_)) self.assertEqual(m.span(), str_span) # these entire strings should be parsed as links

1 0

[commit-gajim] r10517 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:11:24 +0200 (Sat, 11 Oct 2008) New Revision: 10517 Modified: trunk/src/cell_renderer_image.py Log: [thorstenp] don't use tuple as parameters Modified: trunk/src/cell_renderer_image.py =================================================================== --- trunk/src/cell_renderer_image.py 2008-10-11 10:06:49 UTC (rev 10516) +++ trunk/src/cell_renderer_image.py 2008-10-11 10:11:24 UTC (rev 10517) @@ -45,7 +45,8 @@ def do_get_property(self, pspec): return getattr(self, pspec.name) - def func(self, model, path, iter, (image, tree)): + def func(self, model, path, iter, image_tree): + image, tree = image_tree if model.get_value(iter, self.tv_index) != image: return self.redraw = 1

1 0

[commit-gajim] r10516 - trunk/src/common/xmpp
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:06:49 +0200 (Sat, 11 Oct 2008) New Revision: 10516 Modified: trunk/src/common/xmpp/client.py trunk/src/common/xmpp/debug.py trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/features.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/simplexml.py trunk/src/common/xmpp/transports.py Log: [thorstenp] some fixes with type() -> isinstance() Modified: trunk/src/common/xmpp/client.py =================================================================== --- trunk/src/common/xmpp/client.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/client.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -104,7 +104,7 @@ # Who initiated this client # Used to register the EventDispatcher self._caller=caller - if debug and type(debug)!=list: debug=['always', 'nodebuilder'] + if debug and not isinstance(debug, list): debug=['always', 'nodebuilder'] self._DEBUG=Debug.Debug(debug) self.DEBUG=self._DEBUG.Show self.debug_flags=self._DEBUG.debug_flags @@ -321,4 +321,4 @@ except Exception: self.DEBUG(self.DBG,"Failed to authenticate %s"%name,'error') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/debug.py =================================================================== --- trunk/src/common/xmpp/debug.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/debug.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -202,7 +202,7 @@ mod_name )) self.show(' flags defined: %s' % ','.join( self.active )) - if type(flag_show) in (type(''), type(None)): + if type(flag_show) in (str, type(None)): self.flag_show = flag_show else: msg2 = '%s' % type(flag_show ) @@ -329,7 +329,7 @@ This code organises lst and remves dupes """ - if type( items ) != type( [] ) and type( items ) != type( () ): + if not isinstance(items, (list, tuple)): return [ items ] r = [] for l in items: @@ -346,7 +346,7 @@ def _append_unique_str( self, lst, item ): """filter out any dupes.""" - if type(item) != type(''): + if not isinstance(item, str): msg2 = '%s' % item raise 'Invalid item type (should be string)',msg2 if item not in lst: Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/dispatcher.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -354,7 +354,7 @@ def send(self,stanza): """ Serialise stanza and put it on the wire. Assign an unique ID to it before send. Returns assigned ID.""" - if type(stanza) in [type(''), type(u'')]: return self._owner_send(stanza) + if isinstance(stanza, basestring): return self._owner_send(stanza) if not isinstance(stanza,Protocol): _ID=None elif not stanza.getID(): global ID Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -404,7 +404,7 @@ def send(self, stanza, is_message = False, now = False): ''' Serialise stanza and put it on the wire. Assign an unique ID to it before send. Returns assigned ID.''' - if type(stanza) in (type(''), type(u'')): + if isinstance(stanza, basestring): return self._owner.Connection.send(stanza, now = now) if not isinstance(stanza, Protocol): _ID=None Modified: trunk/src/common/xmpp/features.py =================================================================== --- trunk/src/common/xmpp/features.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/features.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -114,7 +114,7 @@ attributes lastErrNode, lastErr and lastErrCode. """ iq=Iq('set',NS_REGISTER,to=host) - if type(info)!=type({}): info=info.asDict() + if not isinstance(info, dict): info=info.asDict() for i in info.keys(): iq.setTag('query').setTagData(i,info[i]) resp=disp.SendAndWaitForResponse(iq) if isResultNode(resp): return 1 @@ -183,4 +183,4 @@ resp=disp.SendAndWaitForResponse(Iq('set',NS_PRIVACY,payload=[Node('list',{'name':listname})])) if isResultNode(resp): return 1 -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/protocol.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -389,7 +389,7 @@ if code: if str(code) in _errorcodes.keys(): error=ErrorNode(_errorcodes[str(code)],text=error) else: error=ErrorNode(ERR_UNDEFINED_CONDITION,code=code,typ='cancel',text=error) - elif type(error) in [type(''),type(u'')]: error=ErrorNode(error) + elif isinstance(error, basestring): error=ErrorNode(error) self.setType('error') self.addChild(node=error) def setTimestamp(self,val=None): @@ -638,7 +638,7 @@ """ Node.__init__(self,'field',node=node) if name: self.setVar(name) - if type(value) in [list,tuple]: self.setValues(value) + if isinstance(value, (list, tuple)): self.setValues(value) elif value: self.setValue(value) if typ: self.setType(typ) elif not typ and not node: self.setType('text-single') @@ -689,7 +689,7 @@ for opt in lst: self.addOption(opt) def addOption(self,opt): """ Add one more label-option pair to this field.""" - if type(opt) in [str,unicode]: self.addChild('option').setTagData('value',opt) + if isinstance(opt, basestring): self.addChild('option').setTagData('value',opt) else: self.addChild('option',{'label':opt[0]}).setTagData('value',opt[1]) def getType(self): """ Get type of this field. """ @@ -737,7 +737,7 @@ for name in data.keys(): newdata.append(DataField(name,data[name])) data=newdata for child in data: - if type(child) in [type(''),type(u'')]: self.addInstructions(child) + if isinstance(child, basestring): self.addInstructions(child) elif child.__class__.__name__=='DataField': self.kids.append(child) else: self.kids.append(DataField(node=child)) def getType(self): @@ -775,7 +775,7 @@ for field in self.getTags('field'): name=field.getAttr('var') typ=field.getType() - if type(typ) in [type(''),type(u'')] and typ.endswith('-multi'): + if isinstance(typ, basestring) and typ.endswith('-multi'): val=[] for i in field.getTags('value'): val.append(i.getData()) else: val=field.getTagData('value') Modified: trunk/src/common/xmpp/simplexml.py =================================================================== --- trunk/src/common/xmpp/simplexml.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/simplexml.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -30,7 +30,7 @@ if isinstance(what, unicode): return what try: r=what.__str__() except AttributeError: r=str(what) - if type(r)!=type(u''): return unicode(r,ENCODING) + if not isinstance(r, unicode): return unicode(r,ENCODING) return r class Node(object): @@ -252,7 +252,7 @@ def setPayload(self,payload,add=0): """ Sets node payload according to the list specified. WARNING: completely replaces all node's previous content. If you wish just to add child or CDATA - use addData or addChild methods. """ - if type(payload) in (type(''),type(u'')): payload=[payload] + if isinstance(payload, basestring): payload=[payload] if add: self.kids+=payload else: self.kids=payload def setTag(self, name, attrs={}, namespace=None): Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-10-11 10:02:49 UTC (rev 10515) +++ trunk/src/common/xmpp/transports.py 2008-10-11 10:06:49 UTC (rev 10516) @@ -139,7 +139,7 @@ """ Writes raw outgoing data. Blocks until done. If supplied data is unicode string, encodes it to utf-8 before send.""" if isinstance(raw_data, unicode): raw_data = raw_data.encode('utf-8') - elif type(raw_data)!=type(str): raw_data = ustr(raw_data).encode('utf-8') + elif not isinstance(raw_data, str): raw_data = ustr(raw_data).encode('utf-8') try: self._send(raw_data) # Avoid printing messages that are empty keepalive packets.

1 0

[commit-gajim] r10515 - in trunk/src/common: . xmpp
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 12:02:49 +0200 (Sat, 11 Oct 2008) New Revision: 10515 Modified: trunk/src/common/atom.py trunk/src/common/xmpp/auth.py trunk/src/common/xmpp/auth_nb.py trunk/src/common/xmpp/browser.py trunk/src/common/xmpp/client.py trunk/src/common/xmpp/debug.py trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/features.py trunk/src/common/xmpp/filetransfer.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/session.py trunk/src/common/xmpp/simplexml.py trunk/src/common/xmpp/transports.py trunk/src/common/xmpp/transports_nb.py Log: [thorstenp] use != instead of <> Modified: trunk/src/common/atom.py =================================================================== --- trunk/src/common/atom.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/atom.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -124,7 +124,7 @@ ''' Get the uri the entry points to (entry's first link element with rel='alternate' or without rel attribute). ''' for element in self.getTags('link'): - if 'rel' in element.attrs and element.attrs['rel']<>'alternate': continue + if 'rel' in element.attrs and element.attrs['rel']!='alternate': continue try: return element.attrs['href'] except AttributeError: Modified: trunk/src/common/xmpp/auth.py =================================================================== --- trunk/src/common/xmpp/auth.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/auth.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -152,7 +152,7 @@ def SASLHandler(self,conn,challenge): """ Perform next SASL auth step. Used internally. """ - if challenge.getNamespace()<>NS_SASL: return + if challenge.getNamespace()!=NS_SASL: return if challenge.getName()=='failure': self.startsasl='failure' try: reason=challenge.getChildren()[0] Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/auth_nb.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -168,7 +168,7 @@ def SASLHandler(self, conn, challenge): ''' Perform next SASL auth step. Used internally. ''' - if challenge.getNamespace() <> NS_SASL: + if challenge.getNamespace() != NS_SASL: return if challenge.getName() == 'failure': self.startsasl = 'failure' Modified: trunk/src/common/xmpp/browser.py =================================================================== --- trunk/src/common/xmpp/browser.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/browser.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -112,8 +112,8 @@ if node is None: node=[None] else: node=node.replace('/',' /').split('/') for i in node: - if i<>'' and i in cur: cur=cur[i] - elif set and i<>'': cur[i]={dict:cur,str:i}; cur=cur[i] + if i!='' and i in cur: cur=cur[i] + elif set and i!='': cur[i]={dict:cur,str:i}; cur=cur[i] elif set or '' in cur: return cur,'' else: return None,None if 1 in cur or set: return cur,1 Modified: trunk/src/common/xmpp/client.py =================================================================== --- trunk/src/common/xmpp/client.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/client.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -104,7 +104,7 @@ # Who initiated this client # Used to register the EventDispatcher self._caller=caller - if debug and type(debug)<>list: debug=['always', 'nodebuilder'] + if debug and type(debug)!=list: debug=['always', 'nodebuilder'] self._DEBUG=Debug.Debug(debug) self.DEBUG=self._DEBUG.Show self.debug_flags=self._DEBUG.debug_flags @@ -203,7 +203,7 @@ If you want to disable tls/ssl support completely, set it to 0. Example: connect(('192.168.5.5',5222),{'host':'proxy.my.net','port':8080,'user':'me','password':'secret'}) Returns '' or 'tcp' or 'tls', depending on the result.""" - if not CommonClient.connect(self,server,proxy,secure,use_srv) or secure<>None and not secure: return self.connected + if not CommonClient.connect(self,server,proxy,secure,use_srv) or secure!=None and not secure: return self.connected transports.TLS().PlugIn(self) if 'version' not in self.Dispatcher.Stream._document_attrs or not self.Dispatcher.Stream._document_attrs['version']=='1.0': return self.connected while not self.Dispatcher.Stream.features and self.Process(): pass # If we get version 1.0 stream the features tag MUST BE presented Modified: trunk/src/common/xmpp/debug.py =================================================================== --- trunk/src/common/xmpp/debug.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/debug.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -329,7 +329,7 @@ This code organises lst and remves dupes """ - if type( items ) <> type( [] ) and type( items ) <> type( () ): + if type( items ) != type( [] ) and type( items ) != type( () ): return [ items ] r = [] for l in items: @@ -346,7 +346,7 @@ def _append_unique_str( self, lst, item ): """filter out any dupes.""" - if type(item) <> type(''): + if type(item) != type(''): msg2 = '%s' % item raise 'Invalid item type (should be string)',msg2 if item not in lst: Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/dispatcher.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -107,7 +107,7 @@ self._owner.send("<?xml version='1.0'?>%s>"%str(self._metastream)[:-2]) def _check_stream_start(self,ns,tag,attrs): - if ns<>NS_STREAMS or tag<>'stream': + if ns!=NS_STREAMS or tag!='stream': raise ValueError('Incorrect stream start: (%s,%s). Terminating.'%(tag,ns)) def Process(self, timeout=0): @@ -300,7 +300,7 @@ session.DEBUG("Expected stanza arrived. Callback %s(%s) found!"%(cb,args),'ok') try: cb(session,stanza,**args) except Exception, typ: - if typ.__class__.__name__<>'NodeProcessed': raise + if typ.__class__.__name__!='NodeProcessed': raise else: session.DEBUG("Expected stanza arrived!",'ok') session._expected[ID]=stanza @@ -310,7 +310,7 @@ try: handler['func'](session,stanza) except Exception, typ: - if typ.__class__.__name__<>'NodeProcessed': + if typ.__class__.__name__!='NodeProcessed': self._pendingExceptions.insert(0, sys.exc_info()) return user=0 Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -117,7 +117,7 @@ self._owner.send("<?xml version='1.0'?>%s>" % str(self._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): - if ns<>NS_STREAMS or tag<>'stream': + if ns!=NS_STREAMS or tag!='stream': raise ValueError('Incorrect stream start: (%s,%s). Terminating.' % (tag, ns)) def ProcessNonBlocking(self, data=None): @@ -343,7 +343,7 @@ try: cb(session,stanza,**args) except Exception, typ: - if typ.__class__.__name__ <>'NodeProcessed': raise + if typ.__class__.__name__ !='NodeProcessed': raise else: session.DEBUG("Expected stanza arrived!",'ok') session._expected[ID]=stanza @@ -354,7 +354,7 @@ try: handler['func'](session,stanza) except Exception, typ: - if typ.__class__.__name__ <> 'NodeProcessed': + if typ.__class__.__name__ != 'NodeProcessed': self._pendingExceptions.insert(0, sys.exc_info()) return user=0 Modified: trunk/src/common/xmpp/features.py =================================================================== --- trunk/src/common/xmpp/features.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/features.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -101,7 +101,7 @@ return df=DataForm(typ='form') for i in resp.getQueryPayload(): - if type(i)<>type(iq): pass + if type(i)!=type(iq): pass elif i.getName()=='instructions': df.addInstructions(i.getData()) else: df.setField(i.getName()).setValue(i.getData()) con.Event(NS_REGISTER,REGISTER_DATA_RECEIVED,(agent,df,False)) @@ -114,7 +114,7 @@ attributes lastErrNode, lastErr and lastErrCode. """ iq=Iq('set',NS_REGISTER,to=host) - if type(info)<>type({}): info=info.asDict() + if type(info)!=type({}): info=info.asDict() for i in info.keys(): iq.setTag('query').setTagData(i,info[i]) resp=disp.SendAndWaitForResponse(iq) if isResultNode(resp): return 1 Modified: trunk/src/common/xmpp/filetransfer.py =================================================================== --- trunk/src/common/xmpp/filetransfer.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/filetransfer.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -147,7 +147,7 @@ else: stream=self._streams[sid] if not data: err=ERR_BAD_REQUEST - elif seq<>stream['seq']: err=ERR_UNEXPECTED_REQUEST + elif seq!=stream['seq']: err=ERR_UNEXPECTED_REQUEST else: self.DEBUG('Successfull receive sid->%s %s+%s bytes'%(sid,stream['fp'].tell(),len(data)),'ok') stream['seq']+=1 Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/protocol.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -372,7 +372,7 @@ errtag=self.getTag('error') if errtag: for tag in errtag.getChildren(): - if tag.getName()<>'text': return tag.getName() + if tag.getName()!='text': return tag.getName() return errtag.getData() def getErrorMsg(self): """ Return the textual description of the error (if present) or the error condition """ Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/session.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -238,9 +238,9 @@ self.sendnow(text+'>') self.set_stream_state(STREAM__OPENED) if self.TYP=='client': return - if tag<>'stream': return self.terminate_stream(STREAM_INVALID_XML) - if ns<>NS_STREAMS: return self.terminate_stream(STREAM_INVALID_NAMESPACE) - if self.Stream.xmlns<>self.xmlns: return self.terminate_stream(STREAM_BAD_NAMESPACE_PREFIX) + if tag!='stream': return self.terminate_stream(STREAM_INVALID_XML) + if ns!=NS_STREAMS: return self.terminate_stream(STREAM_INVALID_NAMESPACE) + if self.Stream.xmlns!=self.xmlns: return self.terminate_stream(STREAM_BAD_NAMESPACE_PREFIX) if 'to' not in attrs: return self.terminate_stream(STREAM_IMPROPER_ADDRESSING) if attrs['to'] not in self._owner.servernames: return self.terminate_stream(STREAM_HOST_UNKNOWN) self.ourname=attrs['to'].lower() @@ -320,7 +320,7 @@ def stop_feature(self,f): """ Declare some feature as "negotiated" to allow other features start negotiating. """ - if self.feature_in_process<>f: raise "Stopping feature %s instead of %s !"%(f,self.feature_in_process) + if self.feature_in_process!=f: raise "Stopping feature %s instead of %s !"%(f,self.feature_in_process) self.feature_in_process=None def set_socket_state(self,newstate): Modified: trunk/src/common/xmpp/simplexml.py =================================================================== --- trunk/src/common/xmpp/simplexml.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/simplexml.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -30,7 +30,7 @@ if isinstance(what, unicode): return what try: r=what.__str__() except AttributeError: r=str(what) - if type(r)<>type(u''): return unicode(r,ENCODING) + if type(r)!=type(u''): return unicode(r,ENCODING) return r class Node(object): @@ -214,10 +214,10 @@ Returns the list of nodes found. """ nodes=[] for node in self.kids: - if namespace and namespace<>node.getNamespace(): continue + if namespace and namespace!=node.getNamespace(): continue if node.getName() == name: for key in attrs.keys(): - if key not in node.attrs or node.attrs[key]<>attrs[key]: break + if key not in node.attrs or node.attrs[key]!=attrs[key]: break else: nodes.append(node) if one and nodes: return nodes[0] if not one: return nodes Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/transports.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -139,7 +139,7 @@ """ Writes raw outgoing data. Blocks until done. If supplied data is unicode string, encodes it to utf-8 before send.""" if isinstance(raw_data, unicode): raw_data = raw_data.encode('utf-8') - elif type(raw_data)<>type(str): raw_data = ustr(raw_data).encode('utf-8') + elif type(raw_data)!=type(str): raw_data = ustr(raw_data).encode('utf-8') try: self._send(raw_data) # Avoid printing messages that are empty keepalive packets. @@ -207,7 +207,7 @@ return try: proto,code,desc=reply.split('\n')[0].split(' ',2) except: raise error('Invalid proxy reply') - if code<>'200': + if code!='200': self.DEBUG('Invalid proxy reply: %s %s %s'%(proto,code,desc),'error') self._owner.disconnected() return @@ -278,7 +278,7 @@ def StartTLSHandler(self, conn, starttls): """ Handle server reply if TLS is allowed to process. Behaves accordingly. Used internally.""" - if starttls.getNamespace()<>NS_TLS: return + if starttls.getNamespace()!=NS_TLS: return self.starttls=starttls.getName() if self.starttls=='failure': self.DEBUG("Got starttls response: "+self.starttls,'error') Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-10-11 09:59:52 UTC (rev 10514) +++ trunk/src/common/xmpp/transports_nb.py 2008-10-11 10:02:49 UTC (rev 10515) @@ -850,7 +850,7 @@ def StartTLSHandler(self, conn, starttls): ''' Handle server reply if TLS is allowed to process. Behaves accordingly. Used internally.''' - if starttls.getNamespace() <> NS_TLS: + if starttls.getNamespace() != NS_TLS: return self.starttls = starttls.getName() if self.starttls == 'failure': @@ -925,7 +925,7 @@ #traceback.print_exc() self.on_proxy_failure('Invalid proxy reply') return - if code <> '200': + if code != '200': self.DEBUG('Invalid proxy reply: %s %s %s' % (proto, code, desc),'error') self._owner.disconnected() self.on_proxy_failure('Invalid proxy reply')

1 0

[commit-gajim] r10514 - in trunk: . src src/common src/common/xmpp src/common/zeroconf test/lib
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 11:59:52 +0200 (Sat, 11 Oct 2008) New Revision: 10514 Modified: trunk/setup_osx.py trunk/src/common/GnuPG.py trunk/src/common/connection_handlers.py trunk/src/common/helpers.py trunk/src/common/xmpp/auth_nb.py trunk/src/common/xmpp/browser.py trunk/src/common/xmpp/c14n.py trunk/src/common/xmpp/client_nb.py trunk/src/common/xmpp/debug.py trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/roster.py trunk/src/common/xmpp/session.py trunk/src/common/xmpp/simplexml.py trunk/src/common/xmpp/transports.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/config.py trunk/src/dialogs.py trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/htmltextview.py trunk/src/lastfm.py trunk/src/roster_window.py trunk/src/systray.py trunk/src/tooltips.py trunk/test/lib/mock.py Log: [thorstenp] use isinstance rather than type(x) == y. use sorted() Modified: trunk/setup_osx.py =================================================================== --- trunk/setup_osx.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/setup_osx.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -70,10 +70,10 @@ ### def check(ret): - if type(ret) == types.ListType: + if isinstance(ret, list): if ret[0] != 0: raise Exception("Command failed: " + ret[1]) - elif type(ret) == types.IntType: + elif isinstance(ret, int): if ret != 0: raise Exception("Command failed") return Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/GnuPG.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -53,7 +53,7 @@ # for that keyword. resp = {} - while 1: + while True: line = helpers.temp_failure_retry(child_stdout.readline) if line == "": break line = line.rstrip() Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/connection_handlers.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -153,7 +153,7 @@ ''' send iq for the present streamhosts and proxies ''' if not self.connection or self.connected < 2: return - if type(self.peerhost) != tuple: + if not isinstance(self.peerhost, tuple): return port = gajim.config.get('file_transfers_port') ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send') @@ -998,7 +998,7 @@ iq3 = iq2.addChild(i) for j in vcard[i]: iq3.addChild(j).setData(vcard[i][j]) - elif type(vcard[i]) == type([]): + elif isinstance(vcard[i], list): for j in vcard[i]: iq3 = iq2.addChild(i) for k in j: Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/helpers.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -363,8 +363,7 @@ return affiliation_name def get_sorted_keys(adict): - keys = adict.keys() - keys.sort() + keys = sorted(adict.keys()) return keys def to_one_line(msg): @@ -1072,8 +1071,7 @@ def get_accounts_info(): '''helper for notification icon tooltip''' accounts = [] - accounts_list = gajim.contacts.get_accounts() - accounts_list.sort() + accounts_list = sorted(gajim.contacts.get_accounts()) for account in accounts_list: status_idx = gajim.connections[account].connected # uncomment the following to hide offline accounts @@ -1238,12 +1236,10 @@ if form_type: S += form_type.getValue() + '<' del fields['FORM_TYPE'] - vars = fields.keys() - vars.sort() + vars = sorted(fields.keys()) for var in vars: S += '%s<' % var - values = fields[var].getValues() - values.sort() + values = sorted(fields[var].getValues()) for value in values: S += '%s<' % value Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -214,8 +214,8 @@ chal = challenge_splitter(data) if not self.realm and 'realm' in chal: self.realm = chal['realm'] - if 'qop' in chal and ((type(chal['qop']) == str and \ - chal['qop'] =='auth') or (type(chal['qop']) == list and 'auth' in \ + if 'qop' in chal and ((isinstance(chal['qop'], str) and \ + chal['qop'] =='auth') or (isinstance(chal['qop'], list) and 'auth' in \ chal['qop'])): resp={} resp['username'] = self.username Modified: trunk/src/common/xmpp/browser.py =================================================================== --- trunk/src/common/xmpp/browser.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/browser.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -195,14 +195,14 @@ q=rep.getTag('query') if request.getQueryNS()==NS_DISCO_ITEMS: # handler must return list: [{jid,action,node,name}] - if type(handler)==dict: lst=handler['items'] + if isinstance(handler, dict): lst=handler['items'] else: lst=handler(conn,request,'items') if lst is None: conn.send(Error(request,ERR_ITEM_NOT_FOUND)) raise NodeProcessed for item in lst: q.addChild('item',item) elif request.getQueryNS()==NS_DISCO_INFO: - if type(handler)==dict: dt=handler['info'] + if isinstance(handler, dict): dt=handler['info'] else: dt=handler(conn,request,'info') if dt is None: conn.send(Error(request,ERR_ITEM_NOT_FOUND)) Modified: trunk/src/common/xmpp/c14n.py =================================================================== --- trunk/src/common/xmpp/c14n.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/c14n.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -7,8 +7,7 @@ if not node.parent or node.parent.namespace != node.namespace: s = s + ' xmlns="%s"' % node.namespace - sorted_attrs = node.attrs.keys() - sorted_attrs.sort() + sorted_attrs = sorted(node.attrs.keys()) for key in sorted_attrs: val = ustr(node.attrs[key]) # like XMLescape() but with whitespace and without > Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/client_nb.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -52,7 +52,7 @@ # Who initiated this client # Used to register the EventDispatcher self._caller = caller - if debug and type(debug) != list: + if debug and not isinstance(debug, list): debug = ['always', 'nodebuilder'] self._DEBUG = Debug.Debug(debug) self.DEBUG = self._DEBUG.Show Modified: trunk/src/common/xmpp/debug.py =================================================================== --- trunk/src/common/xmpp/debug.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/debug.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -170,7 +170,7 @@ self._remove_dupe_flags() if log_file: - if type( log_file ) is type(''): + if isinstance(log_file, str): try: self._fh = open(log_file,'w') except Exception: @@ -291,7 +291,7 @@ if not active_flags: #no debuging at all self.active = [] - elif type( active_flags ) in ( types.TupleType, types.ListType ): + elif isinstance(active_flags, (tuple, list)): flags = self._as_one_list( active_flags ) for t in flags: if t not in self.debug_flags: @@ -333,7 +333,7 @@ return [ items ] r = [] for l in items: - if type( l ) == type([]): + if isinstance(l, list): lst2 = self._as_one_list( l ) for l2 in lst2: self._append_unique_str(r, l2 ) @@ -401,4 +401,4 @@ ##Uncomment this to effectively disable all debugging and all debugging overhead. #Debug=NoDebug -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -295,7 +295,7 @@ output='' if ID in session._expected: user=0 - if type(session._expected[ID])==type(()): + if isinstance(session._expected[ID], tuple): cb,args=session._expected[ID] session.DEBUG("Expected stanza arrived. Callback %s(%s) found!"%(cb,args),'ok') try: cb(session,stanza,**args) @@ -382,4 +382,4 @@ self._owner_send('</stream:stream>') while self.Process(1): pass -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -337,7 +337,7 @@ output='' if ID in session._expected: user=0 - if type(session._expected[ID]) == type(()): + if isinstance(session._expected[ID], tuple): cb,args = session._expected[ID] session.DEBUG("Expected stanza arrived. Callback %s(%s) found!" % (cb, args), 'ok') try: @@ -438,4 +438,4 @@ ''' Send a stream terminator. ''' self._owner.Connection.send('</stream:stream>') -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/protocol.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -254,7 +254,7 @@ JID(node='node',domain='domain.org') """ if not jid and not domain: raise ValueError('JID must contain at least domain name') - elif type(jid)==type(self): self.node,self.domain,self.resource=jid.node,jid.domain,jid.resource + elif isinstance(jid, type(self)): self.node,self.domain,self.resource=jid.node,jid.domain,jid.resource elif domain: self.node,self.domain,self.resource=node,domain,resource else: if jid.find('@')+1: self.node,jid=jid.split('@',1) @@ -321,7 +321,7 @@ if not node and xmlns: self.setNamespace(xmlns) if self['to']: self.setTo(self['to']) if self['from']: self.setFrom(self['from']) - if node and type(self)==type(node) and self.__class__==node.__class__ and 'id' in self.attrs: del self.attrs['id'] + if node and isinstance(self, type(node)) and self.__class__==node.__class__ and 'id' in self.attrs: del self.attrs['id'] self.timestamp=None for d in self.getTags('delay',namespace=NS_DELAY2): try: @@ -732,7 +732,7 @@ if typ: self.setType(typ) self.setNamespace(NS_DATA) if title: self.setTitle(title) - if type(data)==type({}): + if isinstance(data, dict): newdata=[] for name in data.keys(): newdata.append(DataField(name,data[name])) data=newdata Modified: trunk/src/common/xmpp/roster.py =================================================================== --- trunk/src/common/xmpp/roster.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/roster.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -93,7 +93,7 @@ jid=self._owner.Server jid=JID(jid) if jid.getStripped() not in self._data: self._data[jid.getStripped()]={'name':None,'ask':None,'subscription':'none','groups':['Not in roster'],'resources':{}} - if type(self._data[jid.getStripped()]['resources'])!=type(dict()): + if not isinstance(self._data[jid.getStripped()]['resources'], dict): self._data[jid.getStripped()]['resources']={} item=self._data[jid.getStripped()] typ=pres.getType() @@ -194,4 +194,4 @@ """Returns the internal data representation of the roster.""" return self._data -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/session.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -141,7 +141,7 @@ If you just want to shedule regular stanza for delivery use enqueue method. """ if isinstance(chunk,Node): chunk = chunk.__str__().encode('utf-8') - elif type(chunk)==type(u''): chunk = chunk.encode('utf-8') + elif isinstance(chunk, unicode): chunk = chunk.encode('utf-8') self.enqueue(chunk) def enqueue(self,stanza): @@ -349,4 +349,4 @@ requires stream re-start so this state can have non-linear changes. """ if self._stream_state<newstate: self._stream_state=newstate -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/xmpp/simplexml.py =================================================================== --- trunk/src/common/xmpp/simplexml.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/simplexml.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -27,7 +27,7 @@ ENCODING='utf-8' def ustr(what): """Converts object "what" to unicode string using it's own __str__ method if accessible or unicode method otherwise.""" - if type(what) == type(u''): return what + if isinstance(what, unicode): return what try: r=what.__str__() except AttributeError: r=str(what) if type(r)<>type(u''): return unicode(r,ENCODING) Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/xmpp/transports.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -138,8 +138,8 @@ def send(self,raw_data): """ Writes raw outgoing data. Blocks until done. If supplied data is unicode string, encodes it to utf-8 before send.""" - if type(raw_data)==type(u''): raw_data = raw_data.encode('utf-8') - elif type(raw_data)<>type(''): raw_data = ustr(raw_data).encode('utf-8') + if isinstance(raw_data, unicode): raw_data = raw_data.encode('utf-8') + elif type(raw_data)<>type(str): raw_data = ustr(raw_data).encode('utf-8') try: self._send(raw_data) # Avoid printing messages that are empty keepalive packets. @@ -288,4 +288,4 @@ self._owner.Dispatcher.PlugOut() dispatcher.Dispatcher().PlugIn(self._owner) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -69,7 +69,7 @@ def send_socks5_info(self, file_props, fast = True, receiver = None, sender = None): ''' send iq for the present streamhosts and proxies ''' - if type(self.peerhost) != tuple: + if not isinstance(self.peerhost, tuple): return port = gajim.config.get('file_transfers_port') ft_add_hosts_to_send = gajim.config.get('ft_add_hosts_to_send') Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/config.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -2689,8 +2689,7 @@ self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'), 'in_and_out': _('Enter and leave only'), 'none': Q_('?print_status:None')} - opts = self.option_list.keys() - opts.sort() + opts = sorted(self.option_list.keys()) for opt in opts: model.append([self.option_list[opt], opt]) @@ -2892,8 +2891,7 @@ self.nick_entry.set_text('') print_status = model[iter][7] - opts = self.option_list.keys() - opts.sort() + opts = sorted(self.option_list.keys()) self.print_status_combobox.set_active(opts.index(print_status)) def on_title_entry_changed(self, widget): Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/dialogs.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -1940,8 +1940,7 @@ liststore = gtkgui_helpers.get_completion_liststore(self.input_entry) self.completion_dict = helpers.get_contact_dict_for_account(account) # add all contacts to the model - keys = self.completion_dict.keys() - keys.sort() + keys = sorted(self.completion_dict.keys()) for jid in keys: contact = self.completion_dict[jid] img = gajim.interface.jabber_state_images['16'][contact.show] @@ -2180,7 +2179,7 @@ self.cancel_button = self.xml.get_widget('cancel_button') self.close_button = self.xml.get_widget('close_button') self.message_tv_buffer.connect('changed', self.update_char_counter) - if type(to) == type([]): + if isinstance(to, list): jid = ', '.join( [i[0].jid + '/' + i[0].resource for i in to]) self.to_entry.set_text(jid) self.to_entry.set_sensitive(False) @@ -2209,8 +2208,7 @@ if to == '': liststore = gtkgui_helpers.get_completion_liststore(self.to_entry) self.completion_dict = helpers.get_contact_dict_for_account(account) - keys = self.completion_dict.keys() - keys.sort() + keys = sorted(self.completion_dict.keys()) for jid in keys: contact = self.completion_dict[jid] img = gajim.interface.jabber_state_images['16'][contact.show] Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/gajim-remote.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -341,8 +341,7 @@ for account_dict in res: print self.print_info(0, account_dict, True) elif self.command == 'prefs_list': - pref_keys = res.keys() - pref_keys.sort() + pref_keys = sorted(res.keys()) for pref_key in pref_keys: result = '%s = %s' % (pref_key, res[pref_key]) if isinstance(result, unicode): @@ -421,8 +420,7 @@ def compose_help(self): ''' print usage, and list available commands ''' str = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME - commands = self.commands.keys() - commands.sort() + commands = sorted(self.commands.keys()) for command in commands: str += ' ' + command for argument in self.commands[command][1]: Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/gajim.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -2494,7 +2494,7 @@ for image in self.emoticons_images: item = gtk.MenuItem() img = gtk.Image() - if type(image[1]) == gtk.gdk.PixbufAnimation: + if isinstance(image[1], gtk.gdk.PixbufAnimation): img.set_from_animation(image[1]) else: img.set_from_pixbuf(image[1]) Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/htmltextview.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -641,11 +641,11 @@ pifbufs for every resize, gtk.gdk.Pixbuf.scale_simple or similar. ''' - if type(dims[0]) == float: + if isinstance(dims[0], float): dims[0] = int(dims[0]*w) elif not dims[0]: dims[0] = w - if type(dims[1]) == float: + if isinstance(dims[1], float): dims[1] = int(dims[1]*h) if not dims[1]: dims[1] = h Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/lastfm.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -211,7 +211,7 @@ lfm = LastFM(argv[1]) print lfm - while 1: + while True: if lfm.updateData(): print lfm.formatSongTitle() sleep(60) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/roster_window.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -2161,7 +2161,7 @@ def close_all_from_dict(self, dic): '''close all the windows in the given dictionary''' for w in dic.values(): - if type(w) == type({}): + if isinstance(w, dict): self.close_all_from_dict(w) else: w.window.destroy() @@ -2824,7 +2824,7 @@ contact = None): if contact is None: dialogs.SingleMessageWindow(account, action='send') - elif type(contact) == type([]): + elif isinstance(contact, list): dialogs.SingleMessageWindow(account, contact, 'send') else: jid = contact.jid @@ -4555,10 +4555,8 @@ connected_accounts_with_private_storage = 0 - accounts_list = gajim.contacts.get_accounts() - accounts_list.sort() - # items that get shown whether an account is zeroconf or not + accounts_list = sorted(gajim.contacts.get_accounts()) if connected_accounts > 1: # 2 or more accounts? make submenus new_chat_sub_menu = gtk.Menu() Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/systray.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -234,8 +234,7 @@ account_menu_for_single_message) self.popup_menus.append(account_menu_for_single_message) - accounts_list = gajim.contacts.get_accounts() - accounts_list.sort() + accounts_list = sorted(gajim.contacts.get_accounts()) for account in accounts_list: if gajim.connections[account].is_zeroconf: continue Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/src/tooltips.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -460,8 +460,7 @@ iconset = 'dcraven' file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - contact_keys = contacts_dict.keys() - contact_keys.sort() + contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() for priority in contact_keys: for contact in contacts_dict[priority]: Modified: trunk/test/lib/mock.py =================================================================== --- trunk/test/lib/mock.py 2008-10-11 09:51:27 UTC (rev 10513) +++ trunk/test/lib/mock.py 2008-10-11 09:59:52 UTC (rev 10514) @@ -228,8 +228,7 @@ for p in self.params: s = s + sep + repr(p) sep = ', ' - items = self.kwparams.items() - items.sort() + items = sorted(self.kwparams.items()) for k,v in items: s = s + sep + k + '=' + repr(v) sep = ', '

1 0

[commit-gajim] r10513 - trunk/src/common/xmpp
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 11:51:27 +0200 (Sat, 11 Oct 2008) New Revision: 10513 Modified: trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/session.py trunk/src/common/xmpp/simplexml.py trunk/src/common/xmpp/transports.py Log: [thorstenp] replace ` with repr Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:49:30 UTC (rev 10512) +++ trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:51:27 UTC (rev 10513) @@ -49,7 +49,7 @@ def getAnID(self): global ID ID+=1 - return `ID` + return repr(ID) def dumpHandlers(self): """ Return set of user-registered callbacks in it's internal format. @@ -359,7 +359,7 @@ elif not stanza.getID(): global ID ID+=1 - _ID=`ID` + _ID=repr(ID) stanza.setID(_ID) else: _ID=stanza.getID() if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from',self._owner._registered_name) Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:49:30 UTC (rev 10512) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:51:27 UTC (rev 10513) @@ -53,7 +53,7 @@ def getAnID(self): global ID ID += 1 - return `ID` + return repr(ID) def dumpHandlers(self): ''' Return set of user-registered callbacks in it's internal format. @@ -411,7 +411,7 @@ elif not stanza.getID(): global ID ID+=1 - _ID=`ID` + _ID=repr(ID) stanza.setID(_ID) else: _ID=stanza.getID() Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-10-11 09:49:30 UTC (rev 10512) +++ trunk/src/common/xmpp/session.py 2008-10-11 09:51:27 UTC (rev 10513) @@ -85,7 +85,7 @@ self.DEBUG=owner.Dispatcher.DEBUG self._expected={} self._owner=owner - if self.TYP=='server': self.ID=`random.random()`[2:] + if self.TYP=='server': self.ID=repr(random.random())[2:] else: self.ID=None self.sendbuffer='' @@ -128,7 +128,7 @@ except: received = '' if len(received): # length of 0 means disconnect - self.DEBUG(`self.fileno()`+' '+received,'got') + self.DEBUG(repr(self.fileno())+' '+received,'got') else: self.DEBUG('Socket error while receiving data','error') self.set_socket_state(SOCKET_DEAD) @@ -189,7 +189,7 @@ self.set_socket_state(SOCKET_DEAD) self.DEBUG("Socket error while sending data",'error') return self.terminate_stream() - self.DEBUG(`self.fileno()`+' '+self.sendbuffer[:sent],'sent') + self.DEBUG(repr(self.fileno())+' '+self.sendbuffer[:sent],'sent') self._stream_pos_sent+=sent self.sendbuffer=self.sendbuffer[sent:] self._stream_pos_delivered=self._stream_pos_sent # Should be acquired from socket somehow. Take SSL into account. Modified: trunk/src/common/xmpp/simplexml.py =================================================================== --- trunk/src/common/xmpp/simplexml.py 2008-10-11 09:49:30 UTC (rev 10512) +++ trunk/src/common/xmpp/simplexml.py 2008-10-11 09:51:27 UTC (rev 10513) @@ -363,7 +363,7 @@ """XML Parser callback. Used internally""" self.check_data_buffer() self._inc_depth() - self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, `attrs`), 'down') + self.DEBUG(DBG_NODEBUILDER, "DEPTH -> %i , tag -> %s, attrs -> %s" % (self.__depth, tag, repr(attrs)), 'down') if self.__depth == self._dispatch_depth: if not self._mini_dom : self._mini_dom = Node(tag=tag, attrs=attrs, nsp = self._document_nsp, node_built=True) Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-10-11 09:49:30 UTC (rev 10512) +++ trunk/src/common/xmpp/transports.py 2008-10-11 09:51:27 UTC (rev 10513) @@ -103,7 +103,7 @@ self._sock.connect(ai[4]) self._send=self._sock.sendall self._recv=self._sock.recv - self.DEBUG("Successfully connected to remote host %s"%`server`,'start') + self.DEBUG("Successfully connected to remote host %s"%repr(server),'start') return 'ok' except: continue except: pass

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008