Commits October 2008

commits@gajim.org

5 participants
128 discussions

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

11 Oct '08

Author: asterix Date: 2008-10-11 11:49:30 +0200 (Sat, 11 Oct 2008) New Revision: 10512 Modified: trunk/src/common/helpers.py trunk/src/common/nslookup.py trunk/src/common/socks5.py trunk/src/gajim.py trunk/src/ipython_view.py Log: [thorstenp] replace reduce instances Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-10-11 09:44:12 UTC (rev 10511) +++ trunk/src/common/helpers.py 2008-10-11 09:49:30 UTC (rev 10512) @@ -770,8 +770,7 @@ rng.extend(range(48, 57)) char_sequence = map(lambda e:chr(e), rng) from random import sample - return reduce(lambda e1, e2: e1 + e2, - sample(char_sequence, 16)) + return ''.join(sample(char_sequence, 16)) def get_os_info(): if os.name == 'nt': @@ -946,7 +945,7 @@ if lines: lines = map(lambda e: _cut_if_long(e), lines) if lines: - reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines) + reduced_text = '\n'.join(lines) if reduced_text != text: reduced_text += '...' else: Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-10-11 09:44:12 UTC (rev 10511) +++ trunk/src/common/nslookup.py 2008-10-11 09:49:30 UTC (rev 10512) @@ -208,7 +208,7 @@ def _compose_command_line(self): ''' return one line representation of command and its arguments ''' - return reduce(lambda left, right: left + ' ' + right, self._compose_command_args()) + return ' '.join(self._compose_command_args()) def wait_child(self): if self.pipe.poll() is None: Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-10-11 09:44:12 UTC (rev 10511) +++ trunk/src/common/socks5.py 2008-10-11 09:49:30 UTC (rev 10512) @@ -609,7 +609,7 @@ struct.unpack('!BBBB', buff[:4]) if host_type == 0x01: host_arr = struct.unpack('!iiii', buff[4:8]) - host, = reduce(lambda e1, e2: str(e1) + "." + str(e2), host_arr) + host, = '.'.join(str(s) for s in host_arr) host_len = len(host) elif host_type == 0x03: host_len, = struct.unpack('!B' , buff[4]) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 09:44:12 UTC (rev 10511) +++ trunk/src/gajim.py 2008-10-11 09:49:30 UTC (rev 10512) @@ -1570,8 +1570,7 @@ # 'Subject' and 'Snippet' field if cnt >=5: break - senders = reduce(lambda b, a: a + ',\n ' + b, - gmessage['From']) + senders = ',\n '.join(reversed(gmessage['From'])) text += _('\n\nFrom: %(from_address)s\nSubject: %(subject)s\n%(snippet)s') % \ {'from_address': senders, 'subject': gmessage['Subject'], 'snippet': gmessage['Snippet']} Modified: trunk/src/ipython_view.py =================================================================== --- trunk/src/ipython_view.py 2008-10-11 09:44:12 UTC (rev 10511) +++ trunk/src/ipython_view.py 2008-10-11 09:49:30 UTC (rev 10512) @@ -212,25 +212,22 @@ ''' split_line = self.complete_sep.split(line) possibilities = self.IP.complete(split_line[-1]) + + try: + __builtins__.all + except AttributeError: + def all(iterable): + for element in iterable: + if not element: + return False + return True + + def common_prefix(seq): + """Returns the common prefix of a sequence of strings""" + return "".join(c for i, c in enumerate(seq[0]) + if all(s.startswith(c, i) for s in seq)) if possibilities: - def _commonPrefix(str1, str2): - ''' - Reduction function. returns common prefix of two given strings. - - @param str1: First string. - @type str1: string - @param str2: Second string - @type str2: string - - @return: Common prefix to both strings. - @rtype: string - ''' - for i in range(len(str1)): - if not str2.startswith(str1[:i+1]): - return str1[:i] - return str1 - common_prefix = reduce(_commonPrefix, possibilities) - completed = line[:-len(split_line[-1])]+common_prefix + completed = line[:-len(split_line[-1])]+common_prefix(possibilities) else: completed = line return completed, possibilities

1 0

[commit-gajim] r10511 - 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:44:12 +0200 (Sat, 11 Oct 2008) New Revision: 10511 Modified: trunk/src/common/connection.py trunk/src/common/socks5.py trunk/src/common/xmpp/browser.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/session.py trunk/test/lib/mock.py Log: [thorstenp] replace none equality test with identity test Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/common/connection.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -1204,7 +1204,7 @@ ji = gajim.get_jid_without_resource(jid) if gajim.config.should_log(self.name, ji): log_msg = msg - if original_message != None: + if original_message is not None: log_msg = original_message if subject: log_msg = _('Subject: %(subject)s\n%(message)s') % \ Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/common/socks5.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -893,7 +893,7 @@ def connect(self): ''' create the socket and plug it to the idlequeue ''' - if self.ais == None: + if self.ais is None: return None for ai in self.ais: Modified: trunk/src/common/xmpp/browser.py =================================================================== --- trunk/src/common/xmpp/browser.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/common/xmpp/browser.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -197,14 +197,14 @@ # handler must return list: [{jid,action,node,name}] if type(handler)==dict: lst=handler['items'] else: lst=handler(conn,request,'items') - if lst==None: + 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'] else: dt=handler(conn,request,'info') - if dt==None: + if dt is None: conn.send(Error(request,ERR_ITEM_NOT_FOUND)) raise NodeProcessed # handler must return dictionary: Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -93,7 +93,7 @@ self.dispatch('ERROR', (_('Wrong host'), _('The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored.') % ft_host)) listener = gajim.socks5queue.start_listener(port, sha_str, self._result_socks5_sid, file_props['sid']) - if listener == None: + if listener is None: file_props['error'] = -5 self.dispatch('FILE_REQUEST_ERROR', (unicode(receiver), file_props, '')) @@ -263,7 +263,7 @@ if proxyhost['jid'] == jid: proxy = proxyhost - if proxy != None: + if proxy is not None: file_props['streamhost-used'] = True if 'streamhosts' not in file_props: file_props['streamhosts'] = [] @@ -397,7 +397,7 @@ if not mtype: mtype = 'normal' - if frm == None: + if frm is None: for key in self.connection.zeroconf.contacts: if ip == self.connection.zeroconf.contacts[key][zeroconf.C_ADDRESS]: frm = key Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -457,7 +457,7 @@ reason += ' ' + _('Your message could not be sent.') self.dispatch('MSGERROR', [jid, '-1', reason, None, None, session]) - ret = self.connection.send(msg_iq, msg != None, on_ok=on_send_ok, + ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok, on_not_ok=on_send_not_ok) if ret == -1: # Contact Offline Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/src/session.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -62,7 +62,7 @@ chatstate = None # chatstates - look for chatstate tags in a message if not delayed - delayed = msg.getTag('x', namespace=common.xmpp.NS_DELAY) != None + delayed = msg.getTag('x', namespace=common.xmpp.NS_DELAY) is not None if not delayed: composing_xep = False children = msg.getChildren() Modified: trunk/test/lib/mock.py =================================================================== --- trunk/test/lib/mock.py 2008-10-11 09:42:59 UTC (rev 10510) +++ trunk/test/lib/mock.py 2008-10-11 09:44:12 UTC (rev 10511) @@ -116,7 +116,7 @@ raise a MockInterfaceError. Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. """ - if self.realClassMethods == None: + if self.realClassMethods is None: return if name not in self.realClassMethods: raise MockInterfaceError("Calling mock method '%s' that was not found in the original class" % name) @@ -411,7 +411,7 @@ def MATCHES(regex, *args, **kwargs): compiled_regex = re.compile(regex, *args, **kwargs) def testFn(param): - return compiled_regex.match(param) != None + return compiled_regex.match(param) is not None return testFn def SEQ(*sequence):

1 0

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

11 Oct '08

Author: asterix Date: 2008-10-11 11:42:59 +0200 (Sat, 11 Oct 2008) New Revision: 10510 Modified: trunk/src/common/optparser.py trunk/src/common/xmpp/auth.py trunk/src/common/xmpp/auth_nb.py trunk/src/common/xmpp/dispatcher.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/session.py trunk/src/dialogs.py trunk/src/groupchat_control.py trunk/src/htmltextview.py trunk/src/roster_window.py Log: [thorstenp] replace list with tuple in for and if Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/optparser.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -291,8 +291,8 @@ proxies = proxies_str.split(',') for i in range(0, len(proxies)): proxies[i] = proxies[i].strip() - for wrong_proxy in ['proxy65.jabber.autocom.pl', - 'proxy65.jabber.ccc.de']: + for wrong_proxy in ('proxy65.jabber.autocom.pl', + 'proxy65.jabber.ccc.de'): if wrong_proxy in proxies: proxies.remove(wrong_proxy) if not 'transfer.jabber.freenet.de' in proxies: Modified: trunk/src/common/xmpp/auth.py =================================================================== --- trunk/src/common/xmpp/auth.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/auth.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -195,7 +195,7 @@ resp['response']=response resp['charset']='utf-8' sasl_data='' - for key in ['charset','username','realm','nonce','nc','cnonce','digest-uri','response','qop']: + for key in ('charset','username','realm','nonce','nc','cnonce','digest-uri','response','qop'): if key in ['nc','qop','response','charset']: sasl_data+="%s=%s,"%(key,resp[key]) else: sasl_data+='%s="%s",'%(key,resp[key]) ########################################3333 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -239,7 +239,7 @@ resp['response'] = response resp['charset'] = 'utf-8' sasl_data='' - for key in ['charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop']: + for key in ('charset', 'username', 'realm', 'nonce', 'nc', 'cnonce', 'digest-uri', 'response', 'qop'): if key in ['nc','qop','response','charset']: sasl_data += "%s=%s," % (key,resp[key]) else: Modified: trunk/src/common/xmpp/dispatcher.py =================================================================== --- trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/dispatcher.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -209,7 +209,7 @@ def returnStanzaHandler(self,conn,stanza): """ Return stanza back to the sender with <feature-not-implemennted/> error set. """ - if stanza.getType() in ['get','set']: + if stanza.getType() in ('get','set'): conn.send(Error(stanza,ERR_FEATURE_NOT_IMPLEMENTED)) def streamErrorHandler(self,conn,error): Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/dispatcher_nb.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -243,7 +243,7 @@ def returnStanzaHandler(self,conn,stanza): ''' Return stanza back to the sender with <feature-not-implemennted/> error set. ''' - if stanza.getType() in ['get','set']: + if stanza.getType() in ('get','set'): conn.send(Error(stanza,ERR_FEATURE_NOT_IMPLEMENTED)) def streamErrorHandler(self,conn,error): @@ -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 type(stanza) in (type(''), type(u'')): return self._owner.Connection.send(stanza, now = now) if not isinstance(stanza, Protocol): _ID=None Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/protocol.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -173,9 +173,9 @@ temporary-auth-failure -- -- -- The authentication failed because of a temporary error condition within the receiving entity; sent in reply to an <auth/> element or <response/> element.""" ERRORS,_errorcodes={},{} -for ns,errname,errpool in [(NS_XMPP_STREAMS,'STREAM',xmpp_stream_error_conditions), +for ns,errname,errpool in ((NS_XMPP_STREAMS,'STREAM',xmpp_stream_error_conditions), (NS_STANZAS ,'ERR' ,xmpp_stanza_error_conditions), - (NS_SASL ,'SASL' ,sasl_error_conditions)]: + (NS_SASL ,'SASL' ,sasl_error_conditions)): for err in errpool.split('\n')[1:]: cond,code,typ,text=err.split(' -- ') name=errname+'_'+cond.upper().replace('-','_') Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/common/xmpp/session.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -97,7 +97,7 @@ self._session_state=SESSION_NOT_AUTHED self.waiting_features=[] - for feature in [NS_TLS,NS_SASL,NS_BIND,NS_SESSION]: + for feature in (NS_TLS,NS_SASL,NS_BIND,NS_SESSION): if feature in owner.features: self.waiting_features.append(feature) self.features=[] self.feature_in_process=None Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/dialogs.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -2530,7 +2530,7 @@ # Add Widgets - for widget_to_add in ['title_hbox', 'privacy_lists_title_label', + for widget_to_add in ('title_hbox', 'privacy_lists_title_label', 'list_of_rules_label', 'add_edit_rule_label', 'delete_open_buttons_hbox', 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton', 'list_of_rules_combobox', 'delete_open_buttons_hbox', @@ -2544,7 +2544,7 @@ 'new_rule_button', 'save_rule_button', 'privacy_list_refresh_button', 'privacy_list_close_button', 'edit_send_status_checkbutton', 'add_edit_vbox', 'privacy_list_active_checkbutton', - 'privacy_list_default_checkbutton']: + 'privacy_list_default_checkbutton'): self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) self.privacy_lists_title_label.set_label( @@ -2825,10 +2825,10 @@ self.xml = gtkgui_helpers.get_glade('privacy_lists_window.glade') self.window = self.xml.get_widget('privacy_lists_first_window') - for widget_to_add in ['list_of_privacy_lists_combobox', + for widget_to_add in ('list_of_privacy_lists_combobox', 'delete_privacy_list_button', 'open_privacy_list_button', 'new_privacy_list_button', 'new_privacy_list_entry', - 'privacy_lists_refresh_button', 'close_privacy_lists_window_button']: + 'privacy_lists_refresh_button', 'close_privacy_lists_window_button'): self.__dict__[widget_to_add] = self.xml.get_widget( widget_to_add) @@ -3285,7 +3285,7 @@ else: self.special_status_rb.set_active(True) values = value.split() - for v in ['online', 'away', 'xa', 'dnd', 'invisible']: + for v in ('online', 'away', 'xa', 'dnd', 'invisible'): if v in values: self.__dict__[v + '_cb'].set_active(True) else: @@ -3305,7 +3305,7 @@ 'sound_file') self.sound_entry.set_text(value) # sound, popup, auto_open, systray, roster - for option in ['sound', 'popup', 'auto_open', 'systray', 'roster']: + for option in ('sound', 'popup', 'auto_open', 'systray', 'roster'): value = gajim.config.get_per('notifications', str(self.active_num), option) if value == 'yes': @@ -3342,7 +3342,7 @@ status = '' else: status = _('when I am ') - for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + for st in ('online', 'away', 'xa', 'dnd', 'invisible'): if self.__dict__[st + '_cb'].get_active(): status += helpers.get_uf_show(st) + ' ' model[iter][1] = "When %s for %s %s %s" % (event, recipient_type, @@ -3475,7 +3475,7 @@ if self.active_num < 0: return status = '' - for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + for st in ('online', 'away', 'xa', 'dnd', 'invisible'): if self.__dict__[st + '_cb'].get_active(): status += st + ' ' if status: @@ -3491,14 +3491,14 @@ gajim.config.set_per('notifications', str(self.active_num), 'status', 'all') # 'All status' clicked - for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + for st in ('online', 'away', 'xa', 'dnd', 'invisible'): self.__dict__[st + '_cb'].hide() self.special_status_rb.show() else: self.set_status_config() # 'special status' clicked - for st in ['online', 'away', 'xa', 'dnd', 'invisible']: + for st in ('online', 'away', 'xa', 'dnd', 'invisible'): self.__dict__[st + '_cb'].show() self.special_status_rb.hide() Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/groupchat_control.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -1447,7 +1447,7 @@ else: nick1 = nick0 nicks = gajim.contacts.get_nick_list(self.account, self.room_jid) - for nick in [nick0, nick1]: + for nick in (nick0, nick1): if nick in nicks: self.on_send_pm(nick = nick) self.clear(self.msg_textview) Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/htmltextview.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -528,10 +528,10 @@ # build a dictionary mapping styles to methods, for greater speed __style_methods = dict() - for style in ['background-color', 'color', 'font-family', 'font-size', + for style in ('background-color', 'color', 'font-family', 'font-size', 'font-style', 'font-weight', 'margin-left', 'margin-right', 'text-align', 'text-decoration', 'white-space', 'display', - 'width', 'height' ]: + 'width', 'height' ): try: method = locals()['_parse_style_%s' % style.replace('-', '_')] except KeyError: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-11 09:38:17 UTC (rev 10509) +++ trunk/src/roster_window.py 2008-10-11 09:42:59 UTC (rev 10510) @@ -2070,9 +2070,9 @@ for jid in gajim.contacts.get_jid_list(account): lcontact = gajim.contacts.get_contacts(account, jid) ctrl = gajim.interface.msg_win_mgr.get_gc_control(jid, account) - for contact in [c for c in lcontact if ((c.show != 'offline' or - c.is_transport()) and not ctrl)]: - self.chg_contact_status(contact, 'offline', '', account) + for contact in lcontact: + if (contact.show != 'offline' or contact.is_transport()) and not ctrl: + self.chg_contact_status(contact, 'offline', '', account) self.actions_menu_needs_rebuild = True self.update_status_combobox() # Force the rebuild now since the on_activates on the menu itself does @@ -4675,9 +4675,9 @@ if connected_accounts == 0: # no connected accounts, make the menuitems insensitive - for item in [new_chat_menuitem, join_gc_menuitem,\ + for item in (new_chat_menuitem, join_gc_menuitem,\ add_new_contact_menuitem, service_disco_menuitem,\ - single_message_menuitem]: + single_message_menuitem): item.set_sensitive(False) else: # we have one or more connected accounts for item in (new_chat_menuitem, join_gc_menuitem, @@ -4903,9 +4903,9 @@ # make some items insensitive if account is offline if gajim.connections[account].connected < 2: - for widget in [add_contact_menuitem, service_discovery_menuitem, + for widget in (add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, execute_command_menuitem, pep_menuitem, - start_chat_menuitem]: + start_chat_menuitem): widget.set_sensitive(False) else: xml = gtkgui_helpers.get_glade('zeroconf_context_menu.glade') @@ -5069,7 +5069,7 @@ send_custom_status_menuitem.set_submenu(status_menuitems) iconset = gajim.config.get('iconset') path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']: + for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) @@ -5266,8 +5266,8 @@ # Unsensitive many items when account is offline if gajim.connections[account].connected < 2: - for widget in [start_chat_menuitem, rename_menuitem, - edit_groups_menuitem, send_file_menuitem]: + for widget in (start_chat_menuitem, rename_menuitem, + edit_groups_menuitem, send_file_menuitem): widget.set_sensitive(False) event_button = gtkgui_helpers.get_possible_button_event(event) @@ -5369,7 +5369,7 @@ send_custom_status_menuitem.set_submenu(status_menuitems) iconset = gajim.config.get('iconset') path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']: + for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) @@ -5473,11 +5473,11 @@ # Unsensitive many items when account is offline if gajim.connections[account].connected < 2: - for widget in [start_chat_menuitem, send_single_message_menuitem, + for widget in (start_chat_menuitem, send_single_message_menuitem, rename_menuitem, edit_groups_menuitem, send_file_menuitem, subscription_menuitem, add_to_roster_menuitem, remove_from_roster_menuitem, execute_command_menuitem, - send_custom_status_menuitem]: + send_custom_status_menuitem): widget.set_sensitive(False) if gajim.connections[account] and gajim.connections[account].\ @@ -5661,7 +5661,7 @@ send_custom_status_menuitem.set_submenu(status_menuitems) iconset = gajim.config.get('iconset') path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for s in ['online', 'chat', 'away', 'xa', 'dnd', 'offline']: + for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s))

1 0

[commit-gajim] r10509 - in trunk: . src src/osx
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 11:38:17 +0200 (Sat, 11 Oct 2008) New Revision: 10509 Modified: trunk/setup_osx.py trunk/src/gtkgui_helpers.py trunk/src/osx/dbus.py trunk/src/osx/growler.py Log: [thorstenp] replace file with open Modified: trunk/setup_osx.py =================================================================== --- trunk/setup_osx.py 2008-10-11 09:37:13 UTC (rev 10508) +++ trunk/setup_osx.py 2008-10-11 09:38:17 UTC (rev 10509) @@ -88,7 +88,7 @@ def writeScript(filename, contents): - script = file(filename, "w+") + script = open(filename, "w+") script.write(contents) script.close() system("chmod +x %s" % filename) @@ -148,8 +148,8 @@ copy("src/osx/prep_py2app.py", APP_RS) move("dist/Gajim.app/Contents/Resources/__boot__.py", "dist/Gajim.app/Contents/Resources/__boot__.py.org") - new = file("dist/Gajim.app/Contents/Resources/__boot__.py", "w+") - org = file("dist/Gajim.app/Contents/Resources/__boot__.py.org") + new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+") + org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org") for line in org: new.write(line) if (('site.addsitedir' in line) and ('Python' in line)): Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-10-11 09:37:13 UTC (rev 10508) +++ trunk/src/gtkgui_helpers.py 2008-10-11 09:38:17 UTC (rev 10509) @@ -157,7 +157,7 @@ if os.path.exists(xfce_config_file): try: - for line in file(xfce_config_file): + for line in open(xfce_config_file): if line.find('name="Gtk/FontName"') != -1: start = line.find('value="') + 7 return line[start:line.find('"', start)].decode('utf-8') @@ -167,7 +167,7 @@ elif os.path.exists(kde_config_file): try: - for line in file(kde_config_file): + for line in open(kde_config_file): if line.find('font=') == 0: # font=Verdana,9,other_numbers start = 5 # 5 is len('font=') line = line[start:] Modified: trunk/src/osx/dbus.py =================================================================== --- trunk/src/osx/dbus.py 2008-10-11 09:37:13 UTC (rev 10508) +++ trunk/src/osx/dbus.py 2008-10-11 09:38:17 UTC (rev 10509) @@ -20,7 +20,7 @@ def readEnv(): gajimpaths.add_from_root(u'dbus.env', u'dbus.env') try: - dbus_env = file(gajimpaths[u'dbus.env'], "r") + dbus_env = open(gajimpaths[u'dbus.env'], "r") except Exception: return False try: @@ -64,7 +64,7 @@ def writeEnv(env): gajimpaths.add_from_root(u'dbus.env', u'dbus.env') try: - dbus_env = file(gajimpaths[u'dbus.env'], "w+") + dbus_env = open(gajimpaths[u'dbus.env'], "w+") dbus_env.write("DBUS_SESSION_BUS_ADDRESS=\"" + env[0] + "\"\n") dbus_env.write("DBUS_SESSION_BUS_PID=\"" + env[1] + "\"\n") dbus_env.close() Modified: trunk/src/osx/growler.py =================================================================== --- trunk/src/osx/growler.py 2008-10-11 09:37:13 UTC (rev 10508) +++ trunk/src/osx/growler.py 2008-10-11 09:38:17 UTC (rev 10509) @@ -23,7 +23,7 @@ def init(): global growler, notifications - icon = file(os.path.join(gajim.DATA_DIR, "pixmaps", "gajim.icns"), "r") + icon = open(os.path.join(gajim.DATA_DIR, "pixmaps", "gajim.icns"), "r") growler = GrowlNotifier(applicationName = "Gajim", notifications = notifications, applicationIcon = icon.read(), @@ -46,7 +46,7 @@ path_to_image = os.path.abspath( os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'chat_msg_recv.png')) # img to display - icon = file(path_to_image, "r") + icon = open(path_to_image, "r") context = [account, jid, msg_type] growler.notify(event_type, title, text, icon.read(), False, None, context)

1 0

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

11 Oct '08

Author: asterix Date: 2008-10-11 11:37:13 +0200 (Sat, 11 Oct 2008) New Revision: 10508 Modified: trunk/setup_osx.py trunk/src/chat_control.py trunk/src/common/atom.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/helpers.py trunk/src/common/logger.py trunk/src/common/nslookup.py trunk/src/common/optparser.py trunk/src/common/pubsub.py trunk/src/common/sleepy.py trunk/src/common/socks5.py trunk/src/common/stanza_session.py trunk/src/common/xmpp/auth_nb.py trunk/src/common/xmpp/client.py trunk/src/common/xmpp/client_nb.py trunk/src/common/xmpp/commands.py trunk/src/common/xmpp/debug.py trunk/src/common/xmpp/session.py trunk/src/common/xmpp/transports.py trunk/src/common/xmpp/transports_nb.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/common/zeroconf/zeroconf_bonjour.py trunk/src/config.py trunk/src/dialogs.py trunk/src/disco.py trunk/src/features_window.py trunk/src/filetransfers_window.py trunk/src/gajim-remote.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/gtkgui_helpers.py trunk/src/htmltextview.py trunk/src/lastfm.py trunk/src/message_window.py trunk/src/network_manager_listener.py trunk/src/notify.py trunk/src/osx/dbus.py trunk/src/osx/growl/Growl.py trunk/src/remote_control.py trunk/src/roster_window.py trunk/src/systray.py trunk/src/vcard.py trunk/test/runtests.py Log: [thorstenp] di not use emtpy except clauses Modified: trunk/setup_osx.py =================================================================== --- trunk/setup_osx.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/setup_osx.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -82,7 +82,7 @@ def force(func): try: func() - except: + except Exception: pass return Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/chat_control.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -56,7 +56,7 @@ try: import gtkspell HAS_GTK_SPELL = True -except: +except Exception: HAS_GTK_SPELL = False HAVE_MARKUP_TOOLTIPS = gtk.pygtk_version >= (2, 12, 0) @@ -281,7 +281,7 @@ for lang in dict(langs): try: spell.set_language(langs[lang]) - except: + except Exception: del langs[lang] # now set the one the user selected per_type = 'contacts' Modified: trunk/src/common/atom.py =================================================================== --- trunk/src/common/atom.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/atom.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -107,7 +107,7 @@ ''' Get source link ''' try: return self.getTag('feed').getTags('link',{'rel':'alternate'})[1].getData() - except: + except Exception: return None feed_link = property(get_feed_link, None, None, Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/commands.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -121,7 +121,7 @@ try: form = dataforms.SimpleDataForm(extend = request.getTag('command').\ getTag('x')) - except: + except Exception: self.badRequest(request) return False @@ -131,14 +131,14 @@ ('free-for-chat', 'online', 'away', 'xa', 'dnd', 'offline'): self.badRequest(request) return False - except: # KeyError if there's no presence-type field in form or + except Exception: # KeyError if there's no presence-type field in form or # AttributeError if that field is of wrong type self.badRequest(request) return False try: presencedesc = form['presence-desc'].value - except: # same exceptions as in last comment + except Exception: # same exceptions as in last comment presencedesc = u'' response, cmd = self.buildResponse(request, status = 'completed') @@ -219,13 +219,13 @@ try: form = dataforms.SimpleDataForm(extend = request.getTag('command').\ getTag('x')) - except: + except Exception: self.badRequest(request) return False try: gc = form['groupchats'].values - except: # KeyError if there's no groupchats in form + except Exception: # KeyError if there's no groupchats in form self.badRequest(request) return False account = self.connection.name @@ -240,7 +240,7 @@ gajim.interface.roster.remove_groupchat(room_jid, account) continue gc_control.parent_win.remove_tab(gc_control, None, force = True) - except: # KeyError if there's no such room opened + except Exception: # KeyError if there's no such room opened self.badRequest(request) return False response, cmd = self.buildResponse(request, status = 'completed') Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/config.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -481,7 +481,7 @@ def is_valid_int(self, val): try: ival = int(val) - except: + except Exception: return None return ival Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/connection.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -41,7 +41,7 @@ try: randomsource = random.SystemRandom() -except: +except Exception: randomsource = random.Random() randomsource.seed() @@ -447,7 +447,7 @@ try: try: env_http_proxy = os.environ['HTTP_PROXY'] - except: + except Exception: env_http_proxy = os.environ['http_proxy'] env_http_proxy = env_http_proxy.strip('"') # Dispose of the http:// prefix @@ -474,7 +474,7 @@ else: proxy['password'] = u'' - except: + except Exception: proxy = None else: proxy = None Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/connection_handlers.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -67,7 +67,7 @@ HAS_IDLE = True try: import idle -except: +except Exception: gajim.log.debug(_('Unable to load idle module')) HAS_IDLE = False @@ -461,7 +461,7 @@ try: streamhost = query.getTag('streamhost-used') - except: # this bytestream result is not what we need + except Exception: # this bytestream result is not what we need pass id = real_id[3:] if id in self.files_props: @@ -944,7 +944,7 @@ f.close() try: card = common.xmpp.Node(node = c) - except: + except Exception: # We are unable to parse it. Remove it os.remove(path_to_file) return None @@ -1107,7 +1107,7 @@ order = meta.getAttr('order') try: order = int(order) - except: + except Exception: order = 0 if order is not None: data['order'] = order @@ -1174,7 +1174,7 @@ try: photo_decoded = base64.decodestring(photo) avatar_sha = sha.sha(photo_decoded).hexdigest() - except: + except Exception: avatar_sha = '' else: avatar_sha = '' @@ -1388,7 +1388,7 @@ try: idle.init() - except: + except Exception: HAS_IDLE = False self.gmail_last_tid = None @@ -1532,7 +1532,7 @@ status = qp.getData() try: seconds = int(seconds) - except: + except Exception: return id = iq_obj.getID() if id in self.groupchat_jids: @@ -1771,7 +1771,7 @@ try: msg = session.decrypt_stanza(msg) msgtxt = msg.getBody() - except: + except Exception: self.dispatch('FAILED_DECRYPT', (frm, tim, session)) # Receipt requested @@ -1938,7 +1938,7 @@ gajim.log.debug('PresenceCB: %s' % ptype) try: who = helpers.get_full_jid_from_iq(prs) - except: + except Exception: if prs.getTag('error').getTag('jid-malformed'): # wrong jid, we probably tried to change our nick in a room to a non # valid one @@ -2000,7 +2000,7 @@ prio = prs.getPriority() try: prio = int(prio) - except: + except Exception: prio = 0 keyID = '' if sigTag and self.USE_GPG and ptype != 'error': Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/helpers.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -69,7 +69,7 @@ import winsound # windows-only built-in module for playing wav import win32api import win32con -except: +except Exception: pass special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats')) @@ -447,7 +447,7 @@ if os.name == 'nt': try: os.startfile(uri) # if pywin32 is installed we open - except: + except Exception: pass else: @@ -474,14 +474,14 @@ command = build_command(command, uri) try: exec_command(command) - except: + except Exception: pass def launch_file_manager(path_to_open): if os.name == 'nt': try: os.startfile(path_to_open) # if pywin32 is installed we open - except: + except Exception: pass else: if gajim.config.get('openwith') == 'gnome-open': @@ -500,7 +500,7 @@ command = build_command(command, path_to_open) try: exec_command(command) - except: + except Exception: pass def play_sound(event): @@ -524,7 +524,7 @@ try: winsound.PlaySound(path_to_soundfile, winsound.SND_FILENAME|winsound.SND_ASYNC) - except: + except Exception: pass elif os.name == 'posix': if gajim.config.get('soundplayer') == '': @@ -660,7 +660,7 @@ '''make sure string is in UTF-8''' try: string = decode_string(string).encode('utf-8') - except: + except Exception: pass return string @@ -702,7 +702,7 @@ try: val = str(win32api.RegQueryValueEx(rkey, varname)[0]) val = win32api.ExpandEnvironmentStrings(val) # expand using environ - except: + except Exception: pass finally: win32api.RegCloseKey(rkey) Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/logger.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -369,7 +369,7 @@ self.cur.execute( 'SELECT message_id from unread_messages') results = self.cur.fetchall() - except: + except Exception: pass for message in results: msg_id = message[0] Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/nslookup.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -257,7 +257,7 @@ self.idlequeue.unplug_idle(self.fd) try: self.pipe.close() - except: + except Exception: pass def pollend(self): @@ -337,7 +337,7 @@ def process(): try: idlequeue.process() - except: + except Exception: # Otherwise, an exception will stop our loop gobject.timeout_add(200, process) raise Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/optparser.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -67,7 +67,7 @@ def read(self): try: fd = open(self.__filename) - except: + except Exception: if os.path.exists(self.__filename): #we talk about a file print _('error: cannot open %s for reading') % self.__filename @@ -128,7 +128,7 @@ # win32 needs this try: os.remove(self.__filename) - except: + except Exception: pass try: os.rename(self.__tempfile, self.__filename) @@ -360,7 +360,7 @@ ) con.commit() - except: + except Exception: pass con.close() gajim.config.set('version', '0.10.1.4') Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/pubsub.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -116,7 +116,7 @@ try: cb, args, kwargs = self.__callbacks.pop(stanza.getID()) cb(conn, stanza, *args, **kwargs) - except: + except Exception: pass def request_pb_configuration(self, jid, node): Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/sleepy.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -48,7 +48,7 @@ import osx.idle as idle else: # unix import idle -except: +except Exception: gajim.log.debug('Unable to load idle module') SUPPORTED = False @@ -92,7 +92,7 @@ self.state = STATE_AWAKE # assume we are awake try: idle.init() - except: + except Exception: SUPPORTED = False self.state = STATE_UNKNOWN Modified: trunk/src/common/socks5.py =================================================================== --- trunk/src/common/socks5.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/socks5.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -382,7 +382,7 @@ if not self.file.closed: try: self.file.close() - except: + except Exception: pass self.file = None @@ -410,7 +410,7 @@ del(self.file_props['fd']) try: fd.close() - except: + except Exception: pass @@ -559,7 +559,7 @@ try: self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() - except: + except Exception: # socket is already closed pass self.connected = False @@ -580,7 +580,7 @@ for i in xrange(num_auth): mechanism, = struct.unpack('!B', buff[1 + i]) auth_mechanisms.append(mechanism) - except: + except Exception: return None return auth_mechanisms def _get_auth_response(self): @@ -623,7 +623,7 @@ else: port, = struct.unpack('!H', buff[host_len + 5: host_len + 7]) self.remaining_buff = buff[host_len + 7:] - except: + except Exception: return (None, None, None) return (req_type, host, port) @@ -632,7 +632,7 @@ buff = self._recv() try: version, method = struct.unpack('!BB', buff) - except: + except Exception: version, method = None, None if version != 0x05 or method == 0xff: self.disconnect() @@ -814,7 +814,7 @@ self._serv.bind(ai[4]) self.ai = ai break - except: + except Exception: self.ai = None continue if not self.ai: @@ -844,7 +844,7 @@ self.started = False try: self._serv.close() - except: + except Exception: pass def accept_conn(self): @@ -903,7 +903,7 @@ self._sock.setblocking(False) self._server=ai[4] break - except: + except Exception: if sys.exc_value[0] == errno.EINPROGRESS: break #for all errors, we try other addresses Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/stanza_session.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -339,7 +339,7 @@ try: parsed = xmpp.Node(node='<node>' + plaintext + '</node>') - except: + except Exception: raise exceptions.DecryptionError, 'decrypted <data/> not parseable as XML' for child in parsed.getChildren(): Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/auth_nb.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -174,7 +174,7 @@ self.startsasl = 'failure' try: reason = challenge.getChildren()[0] - except: + except Exception: reason = challenge self.DEBUG('Failed SASL authentification: %s' % reason, 'error') if self.on_sasl : Modified: trunk/src/common/xmpp/client.py =================================================================== --- trunk/src/common/xmpp/client.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/client.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -318,7 +318,7 @@ return 'sasl' else: raise auth.NotAuthorized(self.SASL.startsasl) - except: + except Exception: self.DEBUG(self.DBG,"Failed to authenticate %s"%name,'error') # vim: se ts=3: \ No newline at end of file Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/client_nb.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -378,7 +378,7 @@ return self.SASL.auth() self.onreceive(self._on_auth_component) - except: + except Exception: self.DEBUG(self.DBG,"Failed to authenticate %s" % name,'error') def _on_auth_component(self, data): Modified: trunk/src/common/xmpp/commands.py =================================================================== --- trunk/src/common/xmpp/commands.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/commands.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -75,7 +75,7 @@ jid = str(request.getTo()) try: node = request.getTagAttr('command','node') - except: + except Exception: conn.send(Error(request,ERR_BAD_REQUEST)) raise NodeProcessed if jid in self._handlers: @@ -221,11 +221,11 @@ # New request or old? try: session = request.getTagAttr('command','sessionid') - except: + except Exception: session = None try: action = request.getTagAttr('command','action') - except: + except Exception: action = None if action is None: action = 'execute' # Check session is in session list @@ -277,7 +277,7 @@ # This is the only place this should be repeated as all other stages should have SessionIDs try: session = request.getTagAttr('command','sessionid') - except: + except Exception: session = None if session is None: session = self.getSessionID() @@ -309,7 +309,7 @@ form = DataForm(node = result.getTag(name='command').getTag(name='x',namespace=NS_DATA)) try: num = float(form.getField('radius')) - except: + except Exception: self.cmdSecondStageReply(conn,request) if sessions[request.getTagAttr('command','sessionid')]['data']['type'] == 'circlearea': result = num*(pi**2) Modified: trunk/src/common/xmpp/debug.py =================================================================== --- trunk/src/common/xmpp/debug.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/debug.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -173,7 +173,7 @@ if type( log_file ) is type(''): try: self._fh = open(log_file,'w') - except: + except Exception: print 'ERROR: can open %s for writing' sys.exit(0) else: ## assume its a stream type object @@ -196,7 +196,7 @@ caller = sys._getframe(1) # used to get name of caller try: mod_name= ":%s" % caller.f_locals['__name__'] - except: + except Exception: mod_name = "" self.show('Debug created for %s%s' % (caller.f_code.co_filename, mod_name )) @@ -272,7 +272,7 @@ output = output[:-1] try: self._fh.write( output ) - except: + except Exception: # unicode strikes again ;) s=u'' for i in range(len(output)): @@ -304,7 +304,7 @@ # assume comma string try: flags = active_flags.split(',') - except: + except Exception: self.show( '***' ) self.show( '*** Invalid debug param given: %s' % active_flags ) self.show( '*** please correct your param!' ) Modified: trunk/src/common/xmpp/session.py =================================================================== --- trunk/src/common/xmpp/session.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/session.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -184,7 +184,7 @@ try: # LOCK_QUEUE sent=self._send(self.sendbuffer) # blocking socket - except: + except Exception: # UNLOCK_QUEUE self.set_socket_state(SOCKET_DEAD) self.DEBUG("Socket error while sending data",'error') Modified: trunk/src/common/xmpp/transports.py =================================================================== --- trunk/src/common/xmpp/transports.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/transports.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -146,7 +146,7 @@ if raw_data.strip(): self.DEBUG(raw_data,'sent') self._owner.Dispatcher.Event('', DATA_SENT, raw_data) - except: + except Exception: self.DEBUG("Socket error while sending data",'error') self._owner.disconnected() Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/xmpp/transports_nb.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -69,7 +69,7 @@ def gattr(obj, attr, default=None): try: return getattr(obj, attr) - except: + except Exception: return default class SSLWrapper: @@ -368,7 +368,7 @@ self.remove_timeout() try: self._owner.disconnected() - except: + except Exception: pass self.idlequeue.unplug_idle(self.fd) sock = getattr(self, '_sock', None) @@ -652,7 +652,7 @@ retval = None try: retval = gattr(self._owner, 'name') - except: + except Exception: pass if retval: return retval return self.getHost() @@ -768,7 +768,7 @@ cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') try: tcpsock._sslContext.load_verify_locations(cacerts) - except: + except Exception: log.warning('Unable to load SSL certificats from file %s' % \ os.path.abspath(cacerts)) # load users certs @@ -811,7 +811,7 @@ self.starttls='in progress' tcpsock._sslObj.do_handshake() # Errors are handeled in _do_receive function - except: + except Exception: pass tcpsock._sslObj.setblocking(False) log.debug("Synchronous handshake completed") @@ -843,7 +843,7 @@ self._owner.Connection.ssl_cert_pem = OpenSSL.crypto.dump_certificate( OpenSSL.crypto.FILETYPE_PEM, cert) return True - except: + except Exception: log.error("Exception caught in _ssl_info_callback:", exc_info=True) traceback.print_exc() # Make sure something is printed, even if log is disabled. @@ -920,7 +920,7 @@ self.reply = reply.replace('\r', '') try: proto, code, desc = reply.split('\n')[0].split(' ', 2) - except: + except Exception: log.error("_on_headers_sent:", exc_info=True) #traceback.print_exc() self.on_proxy_failure('Invalid proxy reply') Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -45,7 +45,7 @@ HAS_IDLE = True try: import idle -except: +except Exception: gajim.log.debug(_('Unable to load idle module')) HAS_IDLE = False @@ -226,7 +226,7 @@ try: streamhost = query.getTag('streamhost-used') - except: # this bytestream result is not what we need + except Exception: # this bytestream result is not what we need pass id = real_id[3:] if id in self.files_props: @@ -382,7 +382,7 @@ try: idle.init() - except: + except Exception: HAS_IDLE = False def _messageCB(self, ip, con, msg): @@ -429,7 +429,7 @@ try: msg = session.decrypt_stanza(msg) - except: + except Exception: self.dispatch('FAILED_DECRYPT', (frm, tim)) msgtxt = msg.getBody() Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -186,7 +186,7 @@ #check if last part is a number and if, increment it try: stripped = str(int(parts[-1])) - except: + except Exception: stripped = 1 alternative_name = self.username + str(stripped+1) self.name_conflictCB(alternative_name) Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/config.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -48,7 +48,7 @@ try: import gtkspell HAS_GTK_SPELL = True -except: +except Exception: HAS_GTK_SPELL = False from common import helpers @@ -618,7 +618,7 @@ if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) - except: + except Exception: spell_obj = None if not spell_obj: @@ -630,7 +630,7 @@ if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) - except: + except Exception: spell_obj = None if spell_obj: spell_obj.detach() @@ -2014,7 +2014,7 @@ custom_port = widget.get_text() try: custom_port = int(custom_port) - except: + except Exception: if not widget.is_focus(): dialogs.ErrorDialog(_('Invalid entry'), _('Custom port must be a port number.')) @@ -3160,7 +3160,7 @@ custom_port = self.xml.get_widget('custom_port_entry').get_text() try: custom_port = int(custom_port) - except: + except Exception: dialogs.ErrorDialog(_('Invalid entry'), _('Custom port must be a port number.')) return Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/dialogs.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -45,7 +45,7 @@ try: import gtkspell HAS_GTK_SPELL = True -except: +except Exception: HAS_GTK_SPELL = False # those imports are not used in this file, but in files that 'import dialogs' @@ -1753,7 +1753,7 @@ password = self._password_entry.get_text().decode('utf-8') try: nickname = helpers.parse_resource(nickname) - except: + except Exception: ErrorDialog(_('Invalid Nickname'), _('The nickname has not allowed characters.')) return @@ -1764,7 +1764,7 @@ return try: room_jid = helpers.parse_jid(room_jid) - except: + except Exception: ErrorDialog(_('Invalid group chat Jabber ID'), _('The group chat Jabber ID has not allowed characters.')) return @@ -3058,7 +3058,7 @@ path = helpers.get_my_pictures_path() else: path = os.environ['HOME'] - except: + except Exception: path = '' FileChooserDialog.__init__(self, title_text = _('Choose Image'), Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/disco.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -1103,7 +1103,7 @@ iter = None try: iter = self.model.get_iter(row) - except: + except Exception: self.tooltip.hide_tooltip() return jid = self.model[iter][0] @@ -1961,7 +1961,7 @@ have items on the list, we should actualize them. ''' try: subscriptions = request.getTag('pubsub').getTag('subscriptions') - except: + except Exception: return groups = set() Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/features_window.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -164,17 +164,17 @@ try: import OpenSSL.SSL import OpenSSL.crypto - except: + except Exception: return False return True def zeroconf_available(self): try: import avahi - except: + except Exception: try: import pybonjour - except: + except Exception: return False return True @@ -201,7 +201,7 @@ return False try: import gnome.ui - except: + except Exception: return False return True @@ -210,7 +210,7 @@ return False try: import gnomekeyring - except: + except Exception: return False return True @@ -222,7 +222,7 @@ return False try: import gtkspell - except: + except Exception: return False return True @@ -232,7 +232,7 @@ elif sys.platform == 'darwin': try: import osx.growler - except: + except Exception: return False return True from common import dbus_support @@ -240,7 +240,7 @@ return True try: import pynotify - except: + except Exception: return False return True @@ -250,7 +250,7 @@ return True try: import systray - except: + except Exception: return False return True @@ -280,14 +280,14 @@ p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], cwd=gettempdir()) exitcode = p.wait() - except: + except Exception: exitcode = 1 if exitcode == 0: try: p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir()) exitcode = p.wait() - except: + except Exception: exitcode = 1 extensions = ['.tex', '.log', '.aux', '.dvi', '.png'] for ext in extensions: @@ -306,7 +306,7 @@ def docutils_available(self): try: import docutils - except: + except Exception: return False return True Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/filetransfers_window.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -632,7 +632,7 @@ iter = None try: iter = self.model.get_iter(row) - except: + except Exception: self.tooltip.hide_tooltip() return sid = self.model[iter][C_SID].decode('utf-8') Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/gajim-remote.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -38,7 +38,7 @@ try: PREFERRED_ENCODING = locale.getpreferredencoding() -except: +except Exception: PREFERRED_ENCODING = 'UTF-8' def send_error(error_message): @@ -53,7 +53,7 @@ import dbus import dbus.service import dbus.glib -except: +except Exception: print str(exceptions.DbusNotSupported()) sys.exit(1) @@ -358,7 +358,7 @@ if not self.sbus: try: self.sbus = dbus.SessionBus() - except: + except Exception: raise exceptions.SessionBusNotPresent test = False @@ -375,7 +375,7 @@ or exit if it is not possible ''' try: self.sbus = dbus.SessionBus() - except: + except Exception: raise exceptions.SessionBusNotPresent if not self.check_gajim_running(): @@ -484,7 +484,7 @@ if (encode_return): try: ret_str = ret_str.encode(PREFERRED_ENCODING) - except: + except Exception: pass return ret_str Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/gajim.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -179,7 +179,7 @@ import dl libc = dl.open('/lib/libc.so.6') libc.call('prctl', 15, 'gajim\0', 0, 0, 0) - except: + except Exception: pass if gtk.pygtk_version < (2, 8, 0): @@ -208,7 +208,7 @@ try: import winsound # windows-only built-in module for playing wav import win32api # do NOT remove. we req this module - except: + except Exception: pritext = _('Gajim needs pywin32 to run') sectext = _('Please make sure that Pywin32 is installed on your system. You can get it at %s') % 'http://sourceforge.net/project/showfiles.php?group_id=78018' @@ -281,7 +281,7 @@ try: pid = int(pf.read().strip()) pf.close() - except: + except Exception: traceback.print_exc() # PID file exists, but something happened trying to read PID # Could be 0.10 style empty PID file, so assume Gajim is running @@ -290,7 +290,7 @@ if os.name == 'nt': try: from ctypes import (windll, c_ulong, c_int, Structure, c_char, POINTER, pointer, ) - except: + except Exception: return True class PROCESSENTRY32(Structure): @@ -352,7 +352,7 @@ if n.find('gajim') < 0: return False return True # Running Gajim found at pid - except: + except Exception: traceback.print_exc() # If we are here, pidfile exists, but some unexpected error occured. @@ -443,7 +443,7 @@ def _process_events(self, fd, flags): try: return self.process_events(fd, flags) - except: + except Exception: self.remove_idle(fd) self.add_idle(fd, flags) raise @@ -2357,7 +2357,7 @@ img = gtk.Image() try: img.set_from_file(image) - except: + except Exception: return False t = img.get_storage_type() if t != gtk.IMAGE_PIXBUF and t != gtk.IMAGE_ANIMATION: @@ -2566,7 +2566,7 @@ fd.close() del emoticons self._init_emoticons(path, need_reload=True) - except: + except Exception: pass if len(self.emoticons) == 0: dialogs.WarningDialog(_('Emoticons disabled'), @@ -2860,7 +2860,7 @@ ''' try: gajim.idlequeue.process() - except: + except Exception: # Otherwise, an exception will stop our loop if gajim.idlequeue.__class__ == GlibIdleQueue: gobject.timeout_add_seconds(2, self.process_connections) @@ -3074,7 +3074,7 @@ '/apps/nautilus/preferences/click_policy') if click_policy == 'single': gajim.single_click = True - except: + except Exception: pass # add default status messages if there is not in the config file if len(gajim.config.get_per('statusmsg')) == 0: @@ -3167,7 +3167,7 @@ try: import remote_control self.remote_ctrl = remote_control.Remote() - except: + except Exception: self.remote_ctrl = None else: self.remote_ctrl = None @@ -3205,7 +3205,7 @@ bus = dbus.SessionBus() bus.add_signal_receiver(gnome_screensaver_ActiveChanged_cb, 'ActiveChanged', 'org.gnome.ScreenSaver') - except: + except Exception: pass self.show_vcard_when_connect = [] @@ -3261,7 +3261,7 @@ try: import gtkspell spell = gtkspell.Spell(tv, lang) - except: + except Exception: dialogs.AspellDictError(lang) if gajim.config.get('soundplayer') == '': Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/groupchat_control.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -1426,7 +1426,7 @@ nick = message_array[0] try: nick = helpers.parse_resource(nick) - except: + except Exception: # Invalid Nickname dialogs.ErrorDialog(_('Invalid nickname'), _('The nickname has not allowed characters.')) @@ -1707,7 +1707,7 @@ self.change_nick_dialog = None try: nick = helpers.parse_resource(nick) - except: + except Exception: # invalid char dialogs.ErrorDialog(_('Invalid nickname'), _('The nickname has not allowed characters.')) @@ -1876,7 +1876,7 @@ # Test jid try: jid = helpers.parse_jid(jid) - except: + except Exception: dialogs.ErrorDialog(_('Invalid group chat Jabber ID'), _('The group chat Jabber ID has not allowed characters.')) return @@ -2297,7 +2297,7 @@ iter = None try: iter = model.get_iter(row) - except: + except Exception: self.tooltip.hide_tooltip() return typ = model[iter][C_TYPE].decode('utf-8') Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/gtkgui_helpers.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -141,7 +141,7 @@ return client.get_string('/desktop/gnome/interface/font_name' ).decode('utf-8') - except: + except Exception: pass # try to get xfce default font @@ -161,7 +161,7 @@ if line.find('name="Gtk/FontName"') != -1: start = line.find('value="') + 7 return line[start:line.find('"', start)].decode('utf-8') - except: + except Exception: #we talk about file print >> sys.stderr, _('Error: cannot open %s for reading') % xfce_config_file @@ -176,7 +176,7 @@ font_size = values[1] font_string = '%s %s' % (font_name, font_size) # Verdana 9 return font_string.decode('utf-8') - except: + except Exception: #we talk about file print >> sys.stderr, _('Error: cannot open %s for reading') % kde_config_file @@ -650,10 +650,10 @@ for file_path in file_paths: try: file_path = file_path.decode(sys.getfilesystemencoding()) - except: + except Exception: try: file_path = file_path.decode('utf-8') - except: + except Exception: pass file_paths_list.append(file_path) @@ -713,7 +713,7 @@ import gconf # in try because daemon may not be there client = gconf.client_get_default() - except: + except Exception: return old_command = client.get_string('/desktop/gnome/url-handlers/xmpp/command') Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/htmltextview.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -222,7 +222,7 @@ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' - except: + except Exception: pass view.emot_pattern_re = re.compile(emoticons_pattern, re.IGNORECASE) @@ -377,7 +377,7 @@ # validate length val = sign*max(minl,min(abs(val),maxl)) callback(val, *args) - except: + except Exception: warnings.warn('Unable to parse length value "%s"' % value) def __parse_font_size_cb(length, tag): @@ -510,7 +510,7 @@ def __length_tag_cb(self, value, tag, propname): try: tag.set_property(propname, value) - except: + except Exception: gajim.log.warn( "Error with prop: " + propname + " for tag: " + str(tag)) @@ -575,7 +575,7 @@ # Wait 0.1s between each byte try: f.fp._sock.fp._sock.settimeout(0.5) - except: + except Exception: pass # Max image size = 2 MB (to try to prevent DoS) mem = '' @@ -675,7 +675,7 @@ alt = attrs.get('alt', 'Broken image') try: loader.close() - except: + except Exception: pass return pixbuf Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/lastfm.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -75,7 +75,7 @@ xmldocument = urlopen(self.LASTFM_FORMAT_URL % self._username, self._proxies) xmltree = minidom.parse(xmldocument) - except: + except Exception: print 'Error parsing XML from Last.fm...' return False Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/message_window.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -636,7 +636,7 @@ jid = key try: return self._controls[acct][jid] - except: + except Exception: return None else: page_num = key Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/network_manager_listener.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -59,7 +59,7 @@ 'org.freedesktop.NetworkManager', 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') - except: + except Exception: pass # vim: se ts=3: Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/notify.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -54,7 +54,7 @@ try: import osx.growler osx.growler.init() -except: +except Exception: USER_HAS_GROWL = False def get_show_in_roster(event, account, contact, session=None): @@ -313,7 +313,7 @@ 'command') try: helpers.exec_command(command) - except: + except Exception: pass def popup(event_type, jid, account, msg_type='', path_to_image=None, Modified: trunk/src/osx/dbus.py =================================================================== --- trunk/src/osx/dbus.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/osx/dbus.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -21,13 +21,13 @@ gajimpaths.add_from_root(u'dbus.env', u'dbus.env') try: dbus_env = file(gajimpaths[u'dbus.env'], "r") - except: + except Exception: return False try: line1 = dbus_env.readline() line2 = dbus_env.readline() dbus_env.close() - except: + except Exception: print "Invalid dbus.env file" return False return parseEnv(line1, line2) Modified: trunk/src/osx/growl/Growl.py =================================================================== --- trunk/src/osx/growl/Growl.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/osx/growl/Growl.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -12,7 +12,7 @@ try: import _growl -except: +except Exception: _growl = False import types import struct Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/remote_control.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -332,7 +332,7 @@ jid = self._get_real_jid(jid, account) try: jid = helpers.parse_jid(jid) - except: + except Exception: # Jid is not conform, ignore it return DBUS_BOOLEAN(False) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/roster_window.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -1702,7 +1702,7 @@ if not 'com.google.code.Awn' in bus.list_names(): # Awn is not installed return - except: + except Exception: return iconset = gajim.config.get('iconset') prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32') @@ -2379,7 +2379,7 @@ titer = None try: titer = model.get_iter(row) - except: + except Exception: self.tooltip.hide_tooltip() return if model[titer][C_TYPE] in ('contact', 'self_contact'): Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/systray.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -43,10 +43,10 @@ try: import egg.trayicon as trayicon # gnomepythonextras trayicon -except: +except Exception: try: import trayicon # our trayicon - except: + except Exception: gajim.log.debug('No trayicon module available') HAS_SYSTRAY_CAPABILITIES = False Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/src/vcard.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -58,7 +58,7 @@ avatar_encoded = img_encoded try: img_decoded = base64.decodestring(img_encoded) - except: + except Exception: pass if img_decoded: if 'TYPE' in photo: Modified: trunk/test/runtests.py =================================================================== --- trunk/test/runtests.py 2008-10-11 09:32:59 UTC (rev 10507) +++ trunk/test/runtests.py 2008-10-11 09:37:13 UTC (rev 10508) @@ -23,7 +23,7 @@ elif o in ('-v', '--verbose'): try: verbose = int(a) - except: + except Exception: print 'verbose must be a number >= 0' sys.exit(2)

1 0

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

11 Oct '08

Author: asterix Date: 2008-10-11 11:32:59 +0200 (Sat, 11 Oct 2008) New Revision: 10507 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/xmpp/auth.py trunk/src/common/xmpp/c14n.py trunk/src/common/xmpp/protocol.py trunk/src/common/xmpp/simplexml.py trunk/src/common/zeroconf/connection_handlers_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/dialogs.py trunk/src/remote_control.py Log: [thorstenp] use startswith and endswith instead of array indices on strings Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/connection.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -1093,7 +1093,7 @@ if keyID and self.USE_GPG: if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') - elif keyID[8:] == 'MISMATCH': + elif keyID.endswith('MISMATCH'): error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8]) else: #encrypt Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/connection_handlers.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -470,7 +470,7 @@ raise common.xmpp.NodeProcessed if streamhost is None: # proxy approves the activate query - if real_id[:3] == 'au_': + if real_id.startswith('au_'): id = real_id[3:] if 'streamhost-used' not in file_props or \ file_props['streamhost-used'] is False: @@ -488,7 +488,7 @@ file_props['streamhost-used'] is True: raise common.xmpp.NodeProcessed - if real_id[:3] == 'au_': + if real_id.startswith('au_'): if 'stopped' in file and file_props['stopped']: self.remove_transfer(file_props) else: Modified: trunk/src/common/xmpp/auth.py =================================================================== --- trunk/src/common/xmpp/auth.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/xmpp/auth.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -175,7 +175,7 @@ self.DEBUG('Got challenge:'+data,'ok') for pair in data.split(','): key,value=pair.split('=', 1) - if value[:1]=='"' and value[-1:]=='"': value=value[1:-1] + if value.startswith('"') and value.endswith('"'): value=value[1:-1] chal[key]=value if 'qop' in chal and chal['qop']=='auth': resp={} Modified: trunk/src/common/xmpp/c14n.py =================================================================== --- trunk/src/common/xmpp/c14n.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/xmpp/c14n.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -22,7 +22,7 @@ s = s + c14n(a) cnt=cnt+1 if (len(node.data)-1) >= cnt: s = s + normalise_text(node.data[cnt]) - if not node.kids and s[-1:]=='>': + if not node.kids and s.endswith('>'): s=s[:-1]+' />' else: s = s + "</" + node.name + ">" Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/xmpp/protocol.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -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[-6:]=='-multi': + if type(typ) in [type(''),type(u'')] 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 09:31:48 UTC (rev 10506) +++ trunk/src/common/xmpp/simplexml.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -129,7 +129,7 @@ cnt=cnt+1 if not fancy and (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt]) elif (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt].strip()) - if not self.kids and s[-1:]=='>': + if not self.kids and s.endswith('>'): s=s[:-1]+' />' if fancy: s = s + "\n" else: Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -235,7 +235,7 @@ raise common.xmpp.NodeProcessed if streamhost is None: # proxy approves the activate query - if real_id[:3] == 'au_': + if real_id.startswith('au_'): id = real_id[3:] if 'streamhost-used' not in file_props or \ file_props['streamhost-used'] is False: @@ -253,7 +253,7 @@ file_props['streamhost-used'] is True: raise common.xmpp.NodeProcessed - if real_id[:3] == 'au_': + if real_id.startswith('au_'): gajim.socks5queue.send_file(file_props, self.name) raise common.xmpp.NodeProcessed Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -379,7 +379,7 @@ if keyID and self.USE_GPG: if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') - elif keyID[8:] == 'MISMATCH': + elif keyID.endswith('MISMATCH'): error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8]) else: # encrypt Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/dialogs.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -3893,7 +3893,7 @@ verify_now_button.set_no_show_all(True) verify_now_button.hide() - if keyID[8:] == 'MISMATCH': + if keyID.endswith('MISMATCH'): verification_status = _('''Contact's identity NOT verified''') info = _('The contact\'s key (%s) <b>does not match</b> the key ' 'assigned in Gajim.') % keyID[:8] Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2008-10-11 09:31:48 UTC (rev 10506) +++ trunk/src/remote_control.py 2008-10-11 09:32:59 UTC (rev 10507) @@ -271,7 +271,7 @@ connected_account, contact = self._get_account_and_contact(account, jid) if connected_account: - if file_path[:7] == 'file://': + if file_path.startswith('file://'): file_path=file_path[7:] if os.path.isfile(file_path): # is it file? gajim.interface.instances['file_transfers'].send_file(

1 0

[commit-gajim] r10506 - in trunk/src: . common common/zeroconf osx/growl
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 11:31:48 +0200 (Sat, 11 Oct 2008) New Revision: 10506 Modified: trunk/src/common/connection.py trunk/src/common/helpers.py trunk/src/common/zeroconf/roster_zeroconf.py trunk/src/config.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/music_track_listener.py trunk/src/osx/growl/Growl.py trunk/src/roster_window.py trunk/src/tooltips.py Log: [thorstenp] replace if statement with dict.get() Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/common/connection.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -324,10 +324,7 @@ errnum = -1 # we don't have an errnum ssl_msg = '' if errnum > 0: - if errnum in ssl_error: - ssl_msg = ssl_error[errnum] - else: - ssl_msg = _('Unknown SSL error: %d') % errnum + ssl_msg = ssl_error.get(errnum, _('Unknown SSL error: %d') % errnum) ssl_cert = '' if hasattr(self.connection.Connection, 'ssl_cert_pem'): ssl_cert = self.connection.Connection.ssl_cert_pem Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/common/helpers.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -1192,26 +1192,14 @@ return -1 if cat1 > cat2: return 1 - if 'type' in i1: - type1 = i1['type'] - else: - type1 = '' - if 'type' in i2: - type2 = i2['type'] - else: - type2 = '' + type1 = i1.get('type', '') + type2 = i2.get('type', '') if type1 < type2: return -1 if type1 > type2: return 1 - if 'xml:lang' in i1: - lang1 = i1['xml:lang'] - else: - lang1 = '' - if 'xml:lang' in i2: - lang2 = i2['xml:lang'] - else: - lang2 = '' + lang1 = i1.get('xml:lang', '') + lang2 = i2.get('xml:lang', '') if lang1 < lang2: return -1 if lang1 > lang2: @@ -1234,18 +1222,9 @@ identities.sort(cmp=sort_identities_func) for i in identities: c = i['category'] - if 'type' in i: - type_ = i['type'] - else: - type_ = '' - if 'xml:lang' in i: - lang = i['xml:lang'] - else: - lang = '' - if 'name' in i: - name = i['name'] - else: - name = '' + type_ = i.get('type', '') + lang = i.get('xml:lang', '') + name = i.get('name', '') S += '%s/%s/%s/%s<' % (c, type_, lang, name) features.sort() for f in features: Modified: trunk/src/common/zeroconf/roster_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/roster_zeroconf.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/common/zeroconf/roster_zeroconf.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -68,15 +68,10 @@ self._data[jid]['host'] = host self._data[jid]['port'] = port txt_dict = self.zeroconf.txt_array_to_dict(txt) - if 'status' in txt_dict: - status = txt_dict['status'] - else: - status = '' + status = txt_dict.get('status', '') if not status: status = 'avail' - nm = '' - if '1st' in txt_dict: - nm = txt_dict['1st'] + nm = txt_dict.get('1st', '') if 'last' in txt_dict: if nm != '': nm += ' ' @@ -162,4 +157,4 @@ def Unauthorize(self,jid): pass -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/config.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -2499,15 +2499,9 @@ self.start_users_dict[affiliation][jid] = users_dict[jid] tv = self.affiliation_treeview[affiliation] model = tv.get_model() - reason = '' - if 'reason' in users_dict[jid]: - reason = users_dict[jid]['reason'] - nick = '' - if 'nick' in users_dict[jid]: - nick = users_dict[jid]['nick'] - role = '' - if 'role' in users_dict[jid]: - role = users_dict[jid]['role'] + reason = users_dict[jid].get('reason', '') + nick = users_dict[jid].get('nick', '') + role = users_dict[jid].get('role', '') model.append((jid, reason, nick, role)) def on_data_form_window_destroy(self, widget): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/gajim.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -1117,10 +1117,7 @@ # ('VCARD', account, data) '''vcard holds the vcard data''' jid = vcard['jid'] - resource = '' - if 'resource' in vcard: - resource = vcard['resource'] - + resource = vcard.get('resource', '') fjid = jid + '/' + str(resource) # vcard window @@ -1806,9 +1803,7 @@ gajim.gc_connected[account][room_jid]: continue nick = gc_control.nick - password = '' - if room_jid in gajim.gc_passwords: - password = gajim.gc_passwords[room_jid] + password = gajim.gc_passwords.get(room_jid, '') gajim.connections[account].join_gc(nick, room_jid, password) def handle_event_metacontacts(self, account, tags_list): @@ -2203,14 +2198,12 @@ # Do we have a queue? jid = gajim.get_jid_without_resource(jid) no_queue = len(gajim.events.get_events(account, jid)) == 0 - event_type = None # type_ can be gc-invitation file-send-error file-error file-request-error # file-request file-completed file-stopped # event_type can be in advancedNotificationWindow.events_list event_types = {'file-request': 'ft_request', 'file-completed': 'ft_finished'} - if type_ in event_types: - event_type = event_types[type_] + event_type = event_types.get(type_) show_in_roster = notify.get_show_in_roster(event_type, account, jid) show_in_systray = notify.get_show_in_systray(event_type, account, jid) event = gajim.events.create_event(type_, event_args, @@ -3038,7 +3031,6 @@ return True window.connect('delete_event',on_delete) view.updateNamespace({'gajim': gajim}) - gajim.ipython_window = window def __init__(self): gajim.interface = self @@ -3291,6 +3283,7 @@ 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): Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/groupchat_control.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -1891,9 +1891,7 @@ def _on_bookmark_room_menuitem_activate(self, widget): '''bookmark the room, without autojoin and not minimized''' - password = '' - if self.room_jid in gajim.gc_passwords: - password = gajim.gc_passwords[self.room_jid] + password = gajim.gc_passwords.get(self.room_jid, '') gajim.interface.add_gc_bookmark(self.account, self.name, self.room_jid, \ '0', '0', password, self.nick) Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/music_track_listener.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -62,7 +62,8 @@ bus.add_signal_receiver(self._mpris_playing_changed_cb, 'StatusChange', 'org.freedesktop.MediaPlayer') bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.freedesktop.MediaPlayer') + 'NameOwnerChanged', 'org.freedesktop.DBus', + arg0='org.freedesktop.MediaPlayer') ## Muine bus.add_signal_receiver(self._muine_music_track_change_cb, 'SongChanged', @@ -84,7 +85,8 @@ bus.add_signal_receiver(self._banshee_state_changed_cb, 'StateChanged', 'org.bansheeproject.Banshee.PlayerEngine') bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.bansheeproject.Banshee') + 'NameOwnerChanged', 'org.freedesktop.DBus', + arg0='org.bansheeproject.Banshee') def _player_name_owner_changed(self, name, old, new): if not new: @@ -102,27 +104,10 @@ def _mpris_properties_extract(self, song): info = MusicTrackInfo() - - if 'title' in song: - info.title = song['title'] - else: - info.title = '' - - if 'album' in song: - info.album = song['album'] - else: - info.album = '' - - if 'artist' in song: - info.artist = song['artist'] - else: - info.artist = '' - - if 'length' in song: - info.duration = int(song['length']) - else: - info.duration = 0 - + info.title = song.get('title', '') + info.album = song.get('album', '') + info.artist = song.get('artist', '') + info.duration = int(song.get('length', 0)) return info def _mpris_playing_changed_cb(self, playing): @@ -169,9 +154,11 @@ def _banshee_state_changed_cb(self, state): if state == 'playing': bus = dbus.SessionBus() - banshee = bus.get_object("org.bansheeproject.Banshee", "/org/bansheeproject/Banshee/PlayerEngine") + banshee = bus.get_object('org.bansheeproject.Banshee', + '/org/bansheeproject/Banshee/PlayerEngine') currentTrack = banshee.GetCurrentTrack() - self._last_playing_music = self._banshee_properties_extract(currentTrack) + self._last_playing_music = self._banshee_properties_extract( + currentTrack) self.emit('music-track-changed', self._last_playing_music) elif state == 'paused': self.emit('music-track-changed', None) @@ -239,7 +226,7 @@ if __name__ == '__main__': def music_track_change_cb(listener, music_track_info): if music_track_info is None: - print "Stop!" + print 'Stop!' else: print music_track_info.title listener = MusicTrackListener.get() Modified: trunk/src/osx/growl/Growl.py =================================================================== --- trunk/src/osx/growl/Growl.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/osx/growl/Growl.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -70,10 +70,7 @@ self.socket.sendto(data, (self.hostname, GROWL_UDP_PORT)) def PostNotification(self, userInfo): - if GROWL_NOTIFICATION_PRIORITY in userInfo: - priority = userInfo[GROWL_NOTIFICATION_PRIORITY] - else: - priority = 0 + priority = userInfo.get(GROWL_NOTIFICATION_PRIORITY, 0) if GROWL_NOTIFICATION_STICKY in userInfo: sticky = userInfo[GROWL_NOTIFICATION_STICKY] else: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/roster_window.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -1568,15 +1568,9 @@ cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8} s = self.get_show(lcontact1) - if s in cshow: - show1 = cshow[s] - else: - show1 = 9 + show1 = cshow.get(s, 9) s = self.get_show(lcontact2) - if s in cshow: - show2 = cshow[s] - else: - show2 = 9 + show2 = cshow.get(s, 9) removing1 = False removing2 = False if show1 == 6 and jid1 in gajim.to_be_removed[account1]: Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2008-10-10 18:03:25 UTC (rev 10505) +++ trunk/src/tooltips.py 2008-10-11 09:31:48 UTC (rev 10506) @@ -582,9 +582,7 @@ to the given property list. ''' if 'mood' in contact.mood: - mood = contact.mood['mood'].strip() - if mood in MOODS: - mood = MOODS[mood] + mood = MOODS.get(mood, contact.mood['mood'].strip()) mood = gobject.markup_escape_text(mood) mood_string = _('Mood:') + ' <b>%s</b>' % mood if 'text' in contact.mood \ @@ -679,9 +677,7 @@ properties.append((_('Type: '), type)) properties.append((actor, gobject.markup_escape_text(name))) - transfered_len = 0 - if 'received-len' in file_props: - transfered_len = file_props['received-len'] + transfered_len = file_props.get('received-len', 0) properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len))) status = '' if 'started' not in file_props or not file_props['started']:

1 0

[commit-gajim] r10505 - trunk/src/common
by asterix＠gajim.org 10 Oct '08

10 Oct '08

Author: asterix Date: 2008-10-10 20:03:25 +0200 (Fri, 10 Oct 2008) New Revision: 10505 Modified: trunk/src/common/connection.py Log: reconnect correctly when you were conencted with plain connection. Fixes #4390 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-10-09 17:38:07 UTC (rev 10504) +++ trunk/src/common/connection.py 2008-10-10 18:03:25 UTC (rev 10505) @@ -577,7 +577,10 @@ if len(self._hosts): # No config option exist when creating a new account if self.last_connection_type: - self._connection_types = [self.last_connection_type] + if self.last_connection_type == 'tcp': + self._connection_types = ['plain'] + else: + self._connection_types = [self.last_connection_type] elif self.name in gajim.config.get_per('accounts'): self._connection_types = gajim.config.get_per('accounts', self.name, 'connection_types').split()

1 0

[commit-gajim] r10504 - trunk
by js＠gajim.org 09 Oct '08

09 Oct '08

Author: js Date: 2008-10-09 19:38:07 +0200 (Thu, 09 Oct 2008) New Revision: 10504 Removed: trunk/gajim.iss Log: Remove gajim.iss - we use NSIS now. Deleted: trunk/gajim.iss =================================================================== --- trunk/gajim.iss 2008-10-09 14:27:52 UTC (rev 10503) +++ trunk/gajim.iss 2008-10-09 17:38:07 UTC (rev 10504) @@ -1,89 +0,0 @@ -[Setup] -AppName=Gajim -AppVerName=Gajim version 0.11.4 -OutputBaseFilename=gajim-0.11.4-1 -DefaultDirName={pf}\Gajim -DefaultGroupName=Gajim -UninstallDisplayIcon={app}\src\Gajim.exe -Compression=lzma -SolidCompression=yes -SetupIconFile=data\pixmaps\gajim.ico - -[Components] -Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed - -[Tasks] -Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: main -Name: removeprevious; Description: "Remove previously installed version"; GroupDescription: "Previous install:"; Components: main; Check: IsAlreadyInstalled('Gajim'); - -[Files] -Source: "dist\*.pyd"; DestDir: "{app}\src" -Source: "dist\*.dll"; DestDir: "{app}\src" -Source: "dist\*.zip"; DestDir: "{app}\src" -Source: "COPYING"; DestDir: "{app}" -Source: "THANKS"; DestDir: "{app}" -Source: "AUTHORS"; DestDir: "{app}" -Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main -Source: "dist\history_manager.exe"; DestDir: "{app}\src"; components: main -Source: "data\*"; DestDir: "{app}\data"; Flags: recursesubdirs -Source: "po\*.mo"; DestDir: "{app}\po"; Flags: recursesubdirs -;Source: "gtk\*"; DestDir: "{app}\src\gtk"; Flags: recursesubdirs -;Source: "gtk\bin\xmlparse.dll"; DestDir: "{app}\src" -;Source: "gtk\bin\xmltok.dll"; DestDir: "{app}\src" - -[Icons] -Name: "{group}\Gajim"; Filename: "{app}\src\Gajim.exe"; WorkingDir: "{app}\src" -Name: "{group}\History Manager"; Filename: "{app}\src\history_manager.exe"; WorkingDir: "{app}\src" -Name: "{group}\Uninstall Gajim"; Filename: "{app}\unins000.exe"; WorkingDir: "{app}" -Name: "{userdesktop}\Gajim"; Filename: "{app}\src\gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\data\pixmaps\gajim.ico"; Components: main; Tasks: desktopicon - -[Run] -Filename: "{app}\src\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent - -[Code] - -function GetUninstallPath( AppID: String ): String; -var - sPrevPath: String; -begin - sPrevPath := ''; - if not RegQueryStringValue( HKLM, - 'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1', - 'UninstallString', sPrevpath) then - RegQueryStringValue( HKCU, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\'+AppID+'_is1' , - 'UninstallString', sPrevpath); - - Result := sPrevPath; -end; - -function IsAlreadyInstalled( AppID: String ): Boolean; -var - sPrevPath: String; -begin - sPrevPath := GetUninstallPath( AppID ); - - - if ( Length(sPrevPath) > 0 ) then - Result:=true - else - Result:=false; - end; - -procedure CurStepChanged(CurStep: TSetupStep); -var - sUninstPath: String; - sPrevID: String; - ResultCode: Integer; -begin - if CurStep = ssInstall then - begin - sPrevID := 'Gajim'; - sUninstPath := GetUninstallPath( sprevID ); - - if ( Length(sUninstPath) > 0 ) then - begin - sUninstPath := RemoveQuotes(sUninstPath); - Exec( RemoveQuotes(sUninstPath), '/silent', '', SW_SHOW, ewWaitUntilTerminated, ResultCode); - end; - end; -end;

1 0

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

09 Oct '08

Author: asterix Date: 2008-10-09 16:27:52 +0200 (Thu, 09 Oct 2008) New Revision: 10503 Modified: trunk/src/groupchat_control.py Log: prevent traceback when private message window creation fails. Fixes #4393 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-09 08:17:56 UTC (rev 10502) +++ trunk/src/groupchat_control.py 2008-10-09 14:27:52 UTC (rev 10503) @@ -991,7 +991,7 @@ fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid ctrl = self._start_private_message(nick) - if msg: + if ctrl and msg: ctrl.send_message(msg) def on_send_file(self, widget, gc_contact): @@ -2190,7 +2190,8 @@ if not ctrl: ctrl = gajim.interface.new_private_chat(gc_c, self.account) - ctrl.parent_win.set_active_tab(ctrl) + if ctrl: + ctrl.parent_win.set_active_tab(ctrl) return ctrl

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
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