Commits

commits@gajim.org

17632 discussions

gajim: handle nbxmpp logging with -l option (-l .nbxmpp.client_n...
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset fbd03177a95f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fbd03177a95f description: handle nbxmpp logging with -l option (-l .nbxmpp.client_nb=INFO for example) diffstat: src/common/logging_helpers.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r e0ebce4c1716 -r fbd03177a95f src/common/logging_helpers.py --- a/src/common/logging_helpers.py Wed Jan 02 18:23:38 2013 +0100 +++ b/src/common/logging_helpers.py Sun Dec 30 18:54:49 2012 +0100 @@ -152,6 +152,12 @@ root_log.addHandler(consoleloghandler) root_log.propagate = False + # handle nbxmpp logs too + root_log = logging.getLogger('nbxmpp') + root_log.setLevel(logging.WARNING) + root_log.addHandler(consoleloghandler) + root_log.propagate = False + def set_loglevels(loglevels_string): parseAndSetLogLevels(loglevels_string)

1 0

gajim: fix some dict.keys()
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset e0ebce4c1716 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0ebce4c1716 description: fix some dict.keys() diffstat: src/common/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r d815b4a240ba -r e0ebce4c1716 src/common/config.py --- a/src/common/config.py Wed Jan 02 18:17:51 2013 +0100 +++ b/src/common/config.py Wed Jan 02 18:23:38 2013 +0100 @@ -635,7 +635,7 @@ def get(self, optname=None): if not optname: - return self.__options[1].keys() + return list(self.__options[1].keys()) if optname not in self.__options[1]: return None return self.__options[1][optname] @@ -710,7 +710,7 @@ return None dict_ = self.__options_per_key[optname][1] if not key: - return dict_.keys() + return list(dict_.keys()) if key not in dict_: if subname in self.__options_per_key[optname][0]: return self.__options_per_key[optname][0][subname][1]

1 0

gajim: remove has_key()
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 5f81631ea012 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f81631ea012 description: remove has_key() fix base64 calls (requires and returns bytes, not str) diffstat: plugins/dbus_plugin/plugin.py | 2 +- src/common/caps_cache.py | 2 +- src/common/connection_handlers.py | 18 +++++++++--------- src/common/file_props.py | 2 +- src/common/helpers.py | 4 +--- src/common/protocol/bytestream.py | 5 +++-- src/common/resolver.py | 25 ++++++++++++------------- src/common/zeroconf/client_zeroconf.py | 18 +++++++++--------- src/dataforms_widget.py | 3 ++- src/disco.py | 1 - src/gajim-remote.py | 2 +- src/gui_menu_builder.py | 2 +- src/profile_window.py | 3 ++- src/remote_control.py | 2 +- src/roster_window.py | 4 ++-- src/vcard.py | 2 +- 16 files changed, 47 insertions(+), 48 deletions(-) diffs (truncated from 381 to 300 lines): diff -r 690dea6f873b -r 5f81631ea012 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Wed Jan 02 13:54:02 2013 +0100 +++ b/plugins/dbus_plugin/plugin.py Wed Jan 02 17:53:42 2013 +0100 @@ -428,7 +428,7 @@ def account_info(self, account): '''show info on account: resource, jid, nick, prio, message''' result = DBUS_DICT_SS() - if gajim.connections.has_key(account): + if account in gajim.connections: # account is valid con = gajim.connections[account] index = con.connected diff -r 690dea6f873b -r 5f81631ea012 src/common/caps_cache.py --- a/src/common/caps_cache.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/caps_cache.py Wed Jan 02 17:53:42 2013 +0100 @@ -163,7 +163,7 @@ hash_ = hashlib.md5(S.encode('utf-8')) else: return '' - return base64.b64encode(hash_.digest()) + return base64.b64encode(hash_.digest()).decode('utf-8') ################################################################################ diff -r 690dea6f873b -r 5f81631ea012 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/connection_handlers.py Wed Jan 02 17:53:42 2013 +0100 @@ -431,7 +431,8 @@ if 'PHOTO' in vcard and isinstance(vcard['PHOTO'], dict) and \ 'BINVAL' in vcard['PHOTO']: photo = vcard['PHOTO']['BINVAL'] - photo_decoded = base64.decodestring(photo) + photo_decoded = base64.b64decode(photo.encode('utf-8')).decode( + 'utf-8') gajim.interface.save_avatar_files(our_jid, photo_decoded) avatar_sha = hashlib.sha1(photo_decoded).hexdigest() iq2.getTag('PHOTO').setTagData('SHA', avatar_sha) @@ -684,7 +685,7 @@ 'BINVAL' in vcard['PHOTO']: photo = vcard['PHOTO']['BINVAL'] try: - photo_decoded = base64.decodestring(photo) + photo_decoded = base64.b64decode(photo.encode('utf-8')).decode('utf-8') avatar_sha = hashlib.sha1(photo_decoded).hexdigest() except Exception: avatar_sha = '' @@ -970,7 +971,7 @@ decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.connection.Dispatcher.replace_non_character(decmsg) # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) + obj.msgtxt = decmsg.replace('\x00', '') obj.encrypted = 'xep27' self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj]) @@ -1095,7 +1096,7 @@ jid = gajim.get_jid_without_resource(jid) try: - return self.sessions[jid].values() + return list(self.sessions[jid].values()) except KeyError: return [] @@ -1157,7 +1158,7 @@ received a thread_id yet and returns the session that we last sent a message to """ - sessions = self.sessions[jid].values() + sessions = list(self.sessions[jid].values()) # sessions that we haven't received a thread ID in idless = [s for s in sessions if not s.received_thread_id] @@ -1178,7 +1179,7 @@ Find an active session that doesn't have a control attached """ try: - sessions = self.sessions[jid].values() + sessions = list(self.sessions[jid].values()) # filter out everything except the default session type chat_sessions = [s for s in sessions if isinstance(s, @@ -1549,9 +1550,8 @@ iq_obj = obj.stanza.buildReply('result') qp = iq_obj.setQuery() qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime())) - qp.setTagData('tz', helpers.decode_string(tzname[daylight])) - qp.setTagData('display', helpers.decode_string(strftime('%c', - localtime()))) + qp.setTagData('tz', tzname[daylight]) + qp.setTagData('display', strftime('%c', localtime())) else: iq_obj = obj.stanza.buildReply('error') err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ diff -r 690dea6f873b -r 5f81631ea012 src/common/file_props.py --- a/src/common/file_props.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/file_props.py Wed Jan 02 17:53:42 2013 +0100 @@ -64,7 +64,7 @@ @classmethod def getAllFileProp(cls): - return cls._files_props.values() + return list(cls._files_props.values()) @classmethod def setFileProp(cls, fp, account, sid): diff -r 690dea6f873b -r 5f81631ea012 src/common/helpers.py --- a/src/common/helpers.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/helpers.py Wed Jan 02 17:53:42 2013 +0100 @@ -633,8 +633,6 @@ from time import strptime return strptime(timestamp, '%Y%m%dT%H:%M:%S') -# import gajim only when needed (after decode_string is defined) see #4764 - from common import gajim if gajim.HAVE_PYCURL: import pycurl @@ -904,7 +902,7 @@ """ Return the full jid (with resource) from an iq """ - return parse_jid(iq_obj.getFrom()) + return parse_jid(str(iq_obj.getFrom())) def get_jid_from_iq(iq_obj): """ diff -r 690dea6f873b -r 5f81631ea012 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/protocol/bytestream.py Wed Jan 02 17:53:42 2013 +0100 @@ -852,7 +852,8 @@ chunk = file_props.fp.read(file_props.block_size) if chunk: datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', {'sid': sid, - 'seq': file_props.seq}, base64.encodestring(chunk)) + 'seq': file_props.seq}, base64.b64encode(chunk.encode( + 'utf-8')).decode('utf-8')) file_props.seq += 1 file_props.started = True if file_props.seq == 65536: @@ -887,7 +888,7 @@ log.debug('ReceiveHandler called sid->%s seq->%s' % (sid, seq)) try: seq = int(seq) - data = base64.decodestring(data) + data = base64.b64decode(data.encode('utf-8')).decode('utf-8') except Exception: seq = '' data = '' diff -r 690dea6f873b -r 5f81631ea012 src/common/resolver.py --- a/src/common/resolver.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/resolver.py Wed Jan 02 17:53:42 2013 +0100 @@ -70,33 +70,33 @@ # empty host, return empty list of srv records on_ready([]) return - if self.resolved_hosts.has_key(host+type): + if host + type in self.resolved_hosts: # host is already resolved, return cached values log.debug('%s already resolved: %s' % (host, - self.resolved_hosts[host+type])) - on_ready(host, self.resolved_hosts[host+type]) + self.resolved_hosts[host + type])) + on_ready(host, self.resolved_hosts[host + type]) return - if self.handlers.has_key(host+type): + if host + type in self.handlers: # host is about to be resolved by another connection, # attach our callback log.debug('already resolving %s' % host) - self.handlers[host+type].append(on_ready) + self.handlers[host + type].append(on_ready) else: # host has never been resolved, start now log.debug('Starting to resolve %s using %s' % (host, self)) - self.handlers[host+type] = [on_ready] + self.handlers[host + type] = [on_ready] self.start_resolve(host, type) def _on_ready(self, host, type, result_list): # practically it is impossible to be the opposite, but who knows :) host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) - if not self.resolved_hosts.has_key(host+type): - self.resolved_hosts[host+type] = result_list - if self.handlers.has_key(host+type): - for callback in self.handlers[host+type]: + if host + type not in self.resolved_hosts: + self.resolved_hosts[host + type] = result_list + if host + type in self.handlers: + for callback in self.handlers[host + type]: callback(host, result_list) - del(self.handlers[host+type]) + del(self.handlers[host + type]) def start_resolve(self, host, type): pass @@ -251,8 +251,7 @@ domain = None if line.startswith(fqdn): domain = fqdn # For nslookup 9.5 - elif helpers.decode_string(line).startswith(ufqdn): - line = helpers.decode_string(line) + elif line.startswith(ufqdn): domain = ufqdn # For nslookup 9.6 if domain: rest = line[len(domain):].split('=') diff -r 690dea6f873b -r 5f81631ea012 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Wed Jan 02 17:53:42 2013 +0100 @@ -173,7 +173,7 @@ id_ = stanza.getID() if not id_: id_ = self.Dispatcher.getAnID() - if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd): + if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append(( id_, thread_id)) else: @@ -195,7 +195,7 @@ id_ = stanza.getID() if not id_: id_ = self.Dispatcher.getAnID() - if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd): + if self.fd in self.conn_holder.ids_of_awaiting_messages: self.conn_holder.ids_of_awaiting_messages[self.fd].append((id_, thread_id)) else: @@ -253,10 +253,10 @@ 'Incorrect answer from server.') return if self.sock_type == TYPE_SERVER: - if attrs.has_key('from'): + if 'from' in attrs: self.to = attrs['from'] self.send_stream_header() - if attrs.has_key('version') and attrs['version'] == '1.0': + if 'version' in attrs and attrs['version'] == '1.0': # other part supports stream features features = Node('stream:features') self.Dispatcher.send(features) @@ -270,12 +270,12 @@ def on_disconnect(self): if self.conn_holder: - if self.conn_holder.ids_of_awaiting_messages.has_key(self.fd): + if self.fd in self.conn_holder.ids_of_awaiting_messages: del self.conn_holder.ids_of_awaiting_messages[self.fd] self.conn_holder.remove_connection(self.sock_hash) - if self.__dict__.has_key('Dispatcher'): + if 'Dispatcher' in self.__dict__: self.Dispatcher.PlugOut() - if self.__dict__.has_key('P2PConnection'): + if 'P2PConnection' in self.__dict__: self.P2PConnection.PlugOut() self.Connection = None self._caller = None @@ -294,7 +294,7 @@ self.Dispatcher.Stream._document_attrs is None: return self.onreceive(None) - if self.Dispatcher.Stream._document_attrs.has_key('version') and \ + if 'version' in self.Dispatcher.Stream._document_attrs and \ self.Dispatcher.Stream._document_attrs['version'] == '1.0': #~ self.onreceive(self._on_receive_stream_features) #XXX continue with TLS @@ -710,7 +710,7 @@ if self.ip_to_hash[i] == sock_hash: del self.ip_to_hash[i] break - if self.hash_to_port.has_key(sock_hash): + if sock_hash in self.hash_to_port: del self.hash_to_port[sock_hash] def start_listener(self, port): diff -r 690dea6f873b -r 5f81631ea012 src/dataforms_widget.py --- a/src/dataforms_widget.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/dataforms_widget.py Wed Jan 02 17:53:42 2013 +0100 @@ -566,7 +566,8 @@ for uri in field.media.uris: if uri.type_.startswith('image/'): try: - img_data = base64.decodestring(uri.uri_data) + img_data = base64.b64decode(uri.uri_data.encode( + 'utf-8')).decode('utf-8') pixbuf_l = GdkPixbuf.PixbufLoader() pixbuf_l.write(img_data) pixbuf_l.close() diff -r 690dea6f873b -r 5f81631ea012 src/disco.py --- a/src/disco.py Wed Jan 02 13:54:02 2013 +0100 +++ b/src/disco.py Wed Jan 02 17:53:42 2013 +0100 @@ -193,7 +193,6 @@ def __contains__(self, key): return key in self.cache - has_key = __contains__ _icon_cache = CacheDictionary(15) diff -r 690dea6f873b -r 5f81631ea012 src/gajim-remote.py

1 0

gajim: xrange() -> list(range())
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset d815b4a240ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d815b4a240ba description: xrange() -> list(range()) diffstat: src/chat_control.py | 2 +- src/command_system/implementation/execute.py | 2 +- src/common/contacts.py | 4 +++- src/common/socks5.py | 2 +- src/config.py | 10 +++++----- src/dataforms_widget.py | 5 ++--- src/gtkgui_helpers.py | 4 ++-- src/message_window.py | 6 +++--- src/plugins/gui.py | 2 +- src/roster_window.py | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) diffs (202 lines): diff -r 5f81631ea012 -r d815b4a240ba src/chat_control.py --- a/src/chat_control.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/chat_control.py Wed Jan 02 18:17:51 2013 +0100 @@ -916,7 +916,7 @@ scroll = False if pos == size else True # are we scrolling? # we don't want size of the buffer to grow indefinately max_size = gajim.config.get('key_up_lines') - for i in xrange(size - max_size + 1): + for i in range(size - max_size + 1): if pos == 0: break history.pop(0) diff -r 5f81631ea012 -r d815b4a240ba src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/command_system/implementation/execute.py Wed Jan 02 18:17:51 2013 +0100 @@ -68,7 +68,7 @@ @classmethod def poller(cls, processor, popen): - for x in xrange(cls.POLL_COUNT): + for x in list(range(cls.POLL_COUNT)): yield cls.brush(processor, popen) cls.overdue(processor, popen) yield False diff -r 5f81631ea012 -r d815b4a240ba src/common/contacts.py --- a/src/common/contacts.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/common/contacts.py Wed Jan 02 18:17:51 2013 +0100 @@ -28,6 +28,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +from functools import cmp_to_key + try: from common import caps_cache from common.account import Account @@ -848,7 +850,7 @@ Which of the family will be the big brother under wich all others will be ? """ - family.sort(cmp=self._compare_metacontacts) + family.sort(key=cmp_to_key(self._compare_metacontacts)) return family[-1] diff -r 5f81631ea012 -r d815b4a240ba src/common/socks5.py --- a/src/common/socks5.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/common/socks5.py Wed Jan 02 18:17:51 2013 +0100 @@ -781,7 +781,7 @@ auth_mechanisms = [] try: num_auth = struct.unpack('!xB', buff[:2])[0] - for i in xrange(num_auth): + for i in list(range(num_auth)): mechanism, = struct.unpack('!B', buff[1 + i]) auth_mechanisms.append(mechanism) except Exception: diff -r 5f81631ea012 -r d815b4a240ba src/config.py --- a/src/config.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/config.py Wed Jan 02 18:17:51 2013 +0100 @@ -173,7 +173,7 @@ if dir_ != '.svn': l.append(dir_) l.append(_('Disabled')) - for i in xrange(len(l)): + for i in range(len(l)): model.append([l[i]]) if gajim.config.get('emoticons_theme') == l[i]: emoticons_combobox.set_active(i) @@ -243,7 +243,7 @@ l.append(dir) if l.count == 0: l.append(' ') - for i in xrange(len(l)): + for i in range(len(l)): preview = Gtk.Image() files = [] files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', @@ -1279,7 +1279,7 @@ model.clear() l = gajim.config.get_per('proxies') l.insert(0, _('None')) - for i in xrange(len(l)): + for i in range(len(l)): model.append([l[i]]) if our_proxy == l[i]: proxy_combobox.set_active(i) @@ -1766,7 +1766,7 @@ proxy_combobox.set_model(model) l = gajim.config.get_per('proxies') l.insert(0, _('None')) - for i in xrange(len(l)): + for i in range(len(l)): model.append([l[i]]) if our_proxy == l[i]: proxy_combobox.set_active(i) @@ -3757,7 +3757,7 @@ proxies_combobox.set_model(model) l = gajim.config.get_per('proxies') l.insert(0, _('None')) - for i in xrange(len(l)): + for i in range(len(l)): model.append([l[i]]) proxies_combobox.set_active(0) diff -r 5f81631ea012 -r d815b4a240ba src/dataforms_widget.py --- a/src/dataforms_widget.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/dataforms_widget.py Wed Jan 02 18:17:51 2013 +0100 @@ -277,7 +277,7 @@ selection = self.records_treeview.get_selection() model, rowrefs = selection.get_selected_rows() # rowref is a list of paths - for i in xrange(len(rowrefs)): + for i in list(range(len(rowrefs))): rowrefs[i] = Gtk.TreeRowReference(model, rowrefs[i]) # rowref is a list of row references; need to convert because we will # modify the model, paths would change @@ -566,8 +566,7 @@ for uri in field.media.uris: if uri.type_.startswith('image/'): try: - img_data = base64.b64decode(uri.uri_data.encode( - 'utf-8')).decode('utf-8') + img_data = base64.decodestring(uri.uri_data) pixbuf_l = GdkPixbuf.PixbufLoader() pixbuf_l.write(img_data) pixbuf_l.close() diff -r 5f81631ea012 -r d815b4a240ba src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/gtkgui_helpers.py Wed Jan 02 18:17:51 2013 +0100 @@ -317,7 +317,7 @@ def __str__(self): prettydigest = '' - for i in xrange(0, len(self.digest), 2): + for i in list(range(0, len(self.digest), 2)): prettydigest += self.digest[i:i + 2] + ':' return prettydigest[:-1] @@ -1102,7 +1102,7 @@ """ if isinstance (widget, Gtk.Container): children = widget.get_children() - for i in xrange (len (children)): + for i in list(range (len (children))): label_set_autowrap(children[i]) elif isinstance(widget, Gtk.Label): widget.set_line_wrap(True) diff -r 5f81631ea012 -r d815b4a240ba src/message_window.py --- a/src/message_window.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/message_window.py Wed Jan 02 18:17:51 2013 +0100 @@ -106,7 +106,7 @@ '<Control>b', '<Control>F4', '<Control>w', '<Control>Page_Up', '<Control>Page_Down', '<Alt>Right', '<Alt>Left', '<Alt>d', '<Alt>c', '<Alt>m', '<Alt>t', 'Escape'] + \ - ['<Alt>'+str(i) for i in xrange(10)] + ['<Alt>'+str(i) for i in list(range(10))] accel_group = Gtk.AccelGroup() for key in keys: keyval, mod = Gtk.accelerator_parse(key) @@ -856,7 +856,7 @@ to_right = False horiz = self.notebook.get_tab_pos() == Gtk.PositionType.TOP or \ self.notebook.get_tab_pos() == Gtk.PositionType.BOTTOM - for i in xrange(self.notebook.get_n_pages()): + for i in list(range(self.notebook.get_n_pages())): page = self.notebook.get_nth_page(i) tab = self.notebook.get_tab_label(page) tab_alloc = tab.get_allocation() @@ -882,7 +882,7 @@ Find the page num of the tab label """ page_num = -1 - for i in xrange(self.notebook.get_n_pages()): + for i in list(range(self.notebook.get_n_pages())): page = self.notebook.get_nth_page(i) tab = self.notebook.get_tab_label(page) if tab == tab_label: diff -r 5f81631ea012 -r d815b4a240ba src/plugins/gui.py --- a/src/plugins/gui.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/plugins/gui.py Wed Jan 02 18:17:51 2013 +0100 @@ -264,7 +264,7 @@ return model = self.installed_plugins_model - for row in xrange(len(model)): + for row in list(range(len(model))): if plugin == model[row][PLUGIN]: model.remove(model.get_iter((row, PLUGIN))) break diff -r 5f81631ea012 -r d815b4a240ba src/roster_window.py --- a/src/roster_window.py Wed Jan 02 17:53:42 2013 +0100 +++ b/src/roster_window.py Wed Jan 02 18:17:51 2013 +0100 @@ -3225,7 +3225,7 @@ 'attached_gpg_keys').split() keys = {} keyID = _('None') - for i in xrange(len(attached_keys)/2): + for i in list(range(len(attached_keys)/2)): keys[attached_keys[2*i]] = attached_keys[2*i+1] if attached_keys[2*i] == contact.jid: keyID = attached_keys[2*i+1]

1 0

gajim: fix imports and many py3 changements
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 690dea6f873b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=690dea6f873b description: fix imports and many py3 changements diffstat: plugins/dbus_plugin/plugin.py | 2 +- src/advanced_configuration_window.py | 1 - src/chat_control.py | 4 +- src/command_system/dispatcher.py | 5 +- src/command_system/framework.py | 4 +- src/command_system/implementation/execute.py | 4 +- src/command_system/implementation/middleware.py | 3 +- src/command_system/mapping.py | 23 ++++----- src/common/caps_cache.py | 9 ++- src/common/check_paths.py | 10 ++-- src/common/commands.py | 2 +- src/common/config.py | 14 +---- src/common/configpaths.py | 4 +- src/common/connection.py | 2 +- src/common/connection_handlers.py | 4 +- src/common/connection_handlers_events.py | 30 ++++++++++-- src/common/contacts.py | 4 +- src/common/gajim.py | 16 ++---- src/common/gpg.py | 2 +- src/common/helpers.py | 37 ++++++++------- src/common/i18n.py | 2 +- src/common/jingle.py | 12 ++-- src/common/jingle_content.py | 4 +- src/common/jingle_ft.py | 8 +- src/common/jingle_ftstates.py | 4 +- src/common/jingle_rtp.py | 11 ++-- src/common/jingle_session.py | 11 ++-- src/common/jingle_transport.py | 2 +- src/common/jingle_xtls.py | 5 +- src/common/logger.py | 18 +++--- src/common/nec.py | 2 +- src/common/optparser.py | 8 +-- src/common/pep.py | 40 ---------------- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 14 +++-- src/common/sleepy.py | 3 +- src/common/socks5.py | 6 +- src/common/stanza_session.py | 2 +- src/common/zeroconf/connection_zeroconf.py | 2 +- src/common/zeroconf/zeroconf_avahi.py | 2 +- src/config.py | 4 +- src/conversation_textview.py | 8 +- src/dialogs.py | 15 ++--- src/disco.py | 4 +- src/gajim.py | 4 + src/gtkexcepthook.py | 6 +- src/gtkgui_helpers.py | 59 ++++++++++++++---------- src/gui_interface.py | 20 ++++---- src/htmltextview.py | 9 ++- src/notify.py | 3 + src/plugins/__init__.py | 4 +- src/plugins/helpers.py | 2 +- src/plugins/plugin.py | 8 +- src/plugins/pluginmanager.py | 24 +++++----- src/remote_control.py | 2 +- src/roster_window.py | 18 +++--- src/tooltips.py | 4 +- test/lib/mock.py | 2 +- test/unit/test_jingle.py | 4 +- 60 files changed, 261 insertions(+), 279 deletions(-) diffs (truncated from 1880 to 300 lines): diff -r e479aa48ab71 -r 690dea6f873b plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Tue Jan 01 23:18:36 2013 +0100 +++ b/plugins/dbus_plugin/plugin.py Wed Jan 02 13:54:02 2013 +0100 @@ -407,7 +407,7 @@ return DBUS_DICT_SV() jid = self._get_real_jid(jid) - cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid) + cached_vcard = list(gajim.connections.values())[0].get_cached_vcard(jid) if cached_vcard: return get_dbus_struct(cached_vcard) diff -r e479aa48ab71 -r 690dea6f873b src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/advanced_configuration_window.py Wed Jan 02 13:54:02 2013 +0100 @@ -311,7 +311,6 @@ value = str(option) except: value = option - value = helpers.ensure_utf8_string(value) self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter, data): diff -r e479aa48ab71 -r 690dea6f873b src/chat_control.py --- a/src/chat_control.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/chat_control.py Wed Jan 02 13:54:02 2013 +0100 @@ -1785,7 +1785,7 @@ pep = self.contact.pep img = self._pep_images[pep_type] if pep_type in pep: - img.set_from_pixbuf(pep[pep_type].asPixbufIcon()) + img.set_from_pixbuf(gtkgui_helpers.get_pep_as_pixbuf(pep[pep_type])) img.set_tooltip_markup(pep[pep_type].asMarkupText()) img.show() else: @@ -3020,7 +3020,7 @@ # It's why I set it transparent. image = self.xml.get_object('avatar_image') pixbuf = image.get_pixbuf() - pixbuf.fill(0xffffff00L) # RGBA + pixbuf.fill(0xffffff00) # RGBA image.queue_draw() screen_w = Gdk.Screen.width() diff -r e479aa48ab71 -r 690dea6f873b src/command_system/dispatcher.py --- a/src/command_system/dispatcher.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/command_system/dispatcher.py Wed Jan 02 13:54:02 2013 +0100 @@ -31,7 +31,6 @@ over the process. """ -from types import NoneType from .tools import remove COMMANDS = {} @@ -71,7 +70,7 @@ return isinstance(attribute, Command) def is_root(namespace): - metaclass = namespace.get("__metaclass__", NoneType) + metaclass = namespace.get("__metaclass__", None) return issubclass(metaclass, Dispatchable) def get_command(host, name): @@ -83,7 +82,7 @@ def list_commands(host): for container in CONTAINERS[host]: commands = COMMANDS[container] - for name, command in commands.iteritems(): + for name, command in commands.items(): yield name, command class Dispatchable(type): diff -r e479aa48ab71 -r 690dea6f873b src/command_system/framework.py --- a/src/command_system/framework.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/command_system/framework.py Wed Jan 02 13:54:02 2013 +0100 @@ -25,7 +25,7 @@ from .dispatcher import Host, Container from .dispatcher import get_command, list_commands -from mmapping import parse_arguments, adapt_arguments +from .mapping import parse_arguments, adapt_arguments from .errors import DefinitionError, CommandError, NoCommandError class CommandHost(object): @@ -153,7 +153,7 @@ # Automatically set all the properties passed to a constructor # by the command decorator. - for key, value in properties.iteritems(): + for key, value in properties.items(): setattr(self, key, value) def __call__(self, *args, **kwargs): diff -r e479aa48ab71 -r 690dea6f873b src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/command_system/implementation/execute.py Wed Jan 02 13:54:02 2013 +0100 @@ -35,7 +35,7 @@ from subprocess import Popen, PIPE from os.path import expanduser -from glib import timeout_add +from gi.repository import GObject from ..framework import CommandContainer, command, doc from .hosts import * @@ -64,7 +64,7 @@ @classmethod def monitor(cls, processor, popen): poller = cls.poller(processor, popen) - timeout_add(cls.POLL_INTERVAL, poller.next) + GObject.timeout_add(cls.POLL_INTERVAL, poller.next) @classmethod def poller(cls, processor, popen): diff -r e479aa48ab71 -r 690dea6f873b src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/command_system/implementation/middleware.py Wed Jan 02 13:54:02 2013 +0100 @@ -31,7 +31,6 @@ don't need to dig up the code itself to write basic commands. """ -from types import StringTypes from traceback import print_exc from gi.repository import Pango @@ -98,7 +97,7 @@ def command_postprocessor(self, command, name, arguments, args, kwargs, value): # If command returns a string - print it to a user. A convenient # and sufficient in most simple cases shortcut to a using echo. - if value and isinstance(value, StringTypes): + if value and isinstance(value, str): self.echo(value) class CommandTools: diff -r e479aa48ab71 -r 690dea6f873b src/command_system/mapping.py --- a/src/command_system/mapping.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/command_system/mapping.py Wed Jan 02 13:54:02 2013 +0100 @@ -23,7 +23,6 @@ """ import re -from types import BooleanType, UnicodeType from operator import itemgetter from .errors import DefinitionError, CommandError @@ -62,7 +61,7 @@ """ args, opts = [], [] - def intersects_opts((given_start, given_end)): + def intersects_opts(given_start, given_end): """ Check if given span intersects with any of options. """ @@ -71,7 +70,7 @@ return True return False - def intersects_args((given_start, given_end)): + def intersects_args(given_start, given_end): """ Check if given span intersects with any of arguments. """ @@ -97,14 +96,14 @@ # conflicted sectors. Remove any arguments that intersect with # options. for arg, position in args[:]: - if intersects_opts(position): + if intersects_opts(*position): args.remove((arg, position)) # Primitive but sufficiently effective way of disposing of # conflicted sectors. Remove any options that intersect with # arguments. for key, value, position in opts[:]: - if intersects_args(position): + if intersects_args(*position): opts.remove((key, value, position)) return args, opts @@ -207,7 +206,7 @@ # corresponding optin has been given. if command.expand: expanded = [] - for spec_key, spec_value in norm_kwargs.iteritems(): + for spec_key, spec_value in norm_kwargs.items(): letter = spec_key[0] if len(spec_key) > 1 else None if letter and letter not in expanded: for index, (key, value, position) in enumerate(opts): @@ -219,7 +218,7 @@ # Detect switches and set their values accordingly. If any of them # carries a value - append it to args. for index, (key, value, position) in enumerate(opts): - if isinstance(norm_kwargs.get(key), BooleanType): + if isinstance(norm_kwargs.get(key), bool): opts[index] = (key, True, position) if value: args.append((value, position)) @@ -231,8 +230,8 @@ # Stripping down position information supplied with arguments and # options as it won't be needed again. - args = map(lambda (arg, position): arg, args) - opts = map(lambda (key, value, position): (key, value), opts) + args = map(lambda t: t[0], t[1]) + opts = map(lambda t: (t[0], t[1]), opts) # If command has extra option enabled - collect all extra arguments # and pass them to a last positional argument command defines as a @@ -265,8 +264,8 @@ # Normally this does not happen unless overlapping is enabled. for key, value in opts: initial = norm_kwargs.get(key) - if isinstance(initial, BooleanType): - if not isinstance(value, BooleanType): + if isinstance(initial, bool): + if not isinstance(value, bool): raise CommandError("%s: Switch can not take an argument" % key, command) # Inject the source arguments as a string as a first argument, if @@ -299,7 +298,7 @@ letter = key[0] key = key.replace('_', '-') - if isinstance(value, BooleanType): + if isinstance(value, bool): value = str() else: value = '=%s' % value diff -r e479aa48ab71 -r 690dea6f873b src/common/caps_cache.py --- a/src/common/caps_cache.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/common/caps_cache.py Wed Jan 02 13:54:02 2013 +0100 @@ -130,7 +130,8 @@ return 1 S = '' - identities.sort(cmp=sort_identities_func) + from functools import cmp_to_key + identities.sort(key=cmp_to_key(sort_identities_func)) for i in identities: c = i['category'] type_ = i.get('type', '') @@ -140,7 +141,7 @@ features.sort() for f in features: S += '%s<' % f - dataforms.sort(cmp=sort_dataforms_func) + dataforms.sort(key=cmp_to_key(sort_dataforms_func)) for dataform in dataforms: # fields indexed by var fields = {} @@ -157,9 +158,9 @@ S += '%s<' % value if hash_method == 'sha-1': - hash_ = hashlib.sha1(S) + hash_ = hashlib.sha1(S.encode('utf-8')) elif hash_method == 'md5': - hash_ = hashlib.md5(S) + hash_ = hashlib.md5(S.encode('utf-8')) else: return '' return base64.b64encode(hash_.digest()) diff -r e479aa48ab71 -r 690dea6f873b src/common/check_paths.py --- a/src/common/check_paths.py Tue Jan 01 23:18:36 2013 +0100 +++ b/src/common/check_paths.py Wed Jan 02 13:54:02 2013 +0100 @@ -38,7 +38,7 @@ def create_log_db(): print(_('creating logs database')) con = sqlite.connect(logger.LOG_DB_PATH) - os.chmod(logger.LOG_DB_PATH, 0600) # rw only for us + os.chmod(logger.LOG_DB_PATH, 0o600) # rw only for us cur = con.cursor() # create the tables # kind can be @@ -86,7 +86,7 @@ def create_cache_db(): print(_('creating cache database')) con = sqlite.connect(logger.CACHE_DB_PATH) - os.chmod(logger.CACHE_DB_PATH, 0600) # rw only for us + os.chmod(logger.CACHE_DB_PATH, 0o600) # rw only for us cur = con.cursor() cur.executescript( ''' @@ -177,7 +177,7 @@ vars['MY_ICONSETS_PATH'] = gajim.MY_ICONSETS_PATH vars['MY_MOOD_ICONSETS_PATH'] = gajim.MY_MOOD_ICONSETS_PATH vars['MY_ACTIVITY_ICONSETS_PATH'] = gajim.MY_ACTIVITY_ICONSETS_PATH - import configpaths + from common import configpaths MY_DATA = configpaths.gajimpaths['MY_DATA'] MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] MY_CACHE = configpaths.gajimpaths['MY_CACHE'] @@ -263,7 +263,7 @@ VCARD_PATH = gajim.VCARD_PATH AVATAR_PATH = gajim.AVATAR_PATH - import configpaths + from common import configpaths

1 0

gajim: remove call to unicode()
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset aacbaf27ca98 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aacbaf27ca98 description: remove call to unicode() diffstat: src/adhoc_commands.py | 3 - src/chat_control.py | 2 +- src/command_system/dispatcher.py | 2 +- src/command_system/framework.py | 8 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/execute.py | 2 +- src/command_system/implementation/standard.py | 4 +- src/command_system/mapping.py | 8 +-- src/common/check_paths.py | 2 +- src/common/commands.py | 6 +- src/common/configpaths.py | 2 +- src/common/connection.py | 10 +- src/common/connection_handlers.py | 8 +- src/common/connection_handlers_events.py | 8 +- src/common/dataforms.py | 4 +- src/common/gajim.py | 11 +-- src/common/gpg.py | 2 +- src/common/helpers.py | 94 +++++++++++++------------- src/common/i18n.py | 4 +- src/common/jingle_xtls.py | 2 +- src/common/kwalletbinding.py | 2 +- src/common/logger.py | 4 +- src/common/logging_helpers.py | 2 +- src/common/message_archiving.py | 2 +- src/common/optparser.py | 9 +-- src/common/protocol/bytestream.py | 42 ++++++------ src/common/proxy65_manager.py | 2 +- src/common/zeroconf/client_zeroconf.py | 11 +-- src/common/zeroconf/connection_zeroconf.py | 7 +- src/common/zeroconf/zeroconf_avahi.py | 9 +-- src/config.py | 24 +++--- src/conversation_textview.py | 4 - src/dataforms_widget.py | 2 +- src/dialogs.py | 2 +- src/filetransfers_window.py | 14 ++-- src/gajim-remote.py | 16 +--- src/gajim.py | 6 +- src/gajim_themes_window.py | 6 +- src/groupchat_control.py | 10 +-- src/gui_interface.py | 14 ++-- src/message_window.py | 6 +- src/plugins/plugin.py | 14 ++-- src/plugins/pluginmanager.py | 6 +- src/remote_control.py | 12 +- src/roster_window.py | 6 +- src/tooltips.py | 15 +--- src/vcard.py | 16 ++-- 47 files changed, 190 insertions(+), 257 deletions(-) diffs (truncated from 1529 to 300 lines): diff -r dd54d6b1df5d -r aacbaf27ca98 src/adhoc_commands.py --- a/src/adhoc_commands.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/adhoc_commands.py Tue Jan 01 21:06:16 2013 +0100 @@ -281,8 +281,6 @@ # close old stage self.stage_finish() - assert isinstance(self.commandnode, unicode) - self.form_status = None self.stages_notebook.set_current_page( @@ -608,7 +606,6 @@ Send the command with data form. Wait for reply """ # create the stanza - assert isinstance(self.commandnode, unicode) assert action in ('execute', 'prev', 'next', 'complete') stanza = nbxmpp.Iq(typ='set', to=self.jid) diff -r dd54d6b1df5d -r aacbaf27ca98 src/chat_control.py --- a/src/chat_control.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/chat_control.py Tue Jan 01 21:06:16 2013 +0100 @@ -2505,7 +2505,7 @@ if num_unread == 1 and not gajim.config.get('show_unread_tab_icon'): unread = '*' elif num_unread > 1: - unread = '[' + unicode(num_unread) + ']' + unread = '[' + str(num_unread) + ']' # Draw tab label using chatstate theme = gajim.config.get('roster_theme') diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/dispatcher.py --- a/src/command_system/dispatcher.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/dispatcher.py Tue Jan 01 21:06:16 2013 +0100 @@ -32,7 +32,7 @@ """ from types import NoneType -from tools import remove +from .tools import remove COMMANDS = {} CONTAINERS = {} diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/framework.py --- a/src/command_system/framework.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/framework.py Tue Jan 01 21:06:16 2013 +0100 @@ -23,10 +23,10 @@ from types import FunctionType from inspect import getargspec, getdoc -from dispatcher import Host, Container -from dispatcher import get_command, list_commands -from mapping import parse_arguments, adapt_arguments -from errors import DefinitionError, CommandError, NoCommandError +from .dispatcher import Host, Container +from .dispatcher import get_command, list_commands +from mmapping import parse_arguments, adapt_arguments +from .errors import DefinitionError, CommandError, NoCommandError class CommandHost(object): """ diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/implementation/custom.py Tue Jan 01 21:06:16 2013 +0100 @@ -35,7 +35,7 @@ """ from ..framework import CommandContainer, command, doc -from hosts import * +from .hosts import * class CustomCommonCommands(CommandContainer): """ diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/implementation/execute.py Tue Jan 01 21:06:16 2013 +0100 @@ -38,7 +38,7 @@ from glib import timeout_add from ..framework import CommandContainer, command, doc -from hosts import * +from .hosts import * class Execute(CommandContainer): AUTOMATIC = True diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/implementation/standard.py Tue Jan 01 21:06:16 2013 +0100 @@ -30,8 +30,8 @@ from ..framework import CommandContainer, command, doc from ..mapping import generate_usage -from hosts import * -import execute +from .hosts import * +from . import execute # This holds constants fron the logger, which we'll be using in some of our # commands. diff -r dd54d6b1df5d -r aacbaf27ca98 src/command_system/mapping.py --- a/src/command_system/mapping.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/command_system/mapping.py Tue Jan 01 21:06:16 2013 +0100 @@ -26,7 +26,7 @@ from types import BooleanType, UnicodeType from operator import itemgetter -from errors import DefinitionError, CommandError +from .errors import DefinitionError, CommandError # Quite complex piece of regular expression logic to parse options and # arguments. Might need some tweaking along the way. @@ -269,12 +269,6 @@ if not isinstance(value, BooleanType): raise CommandError("%s: Switch can not take an argument" % key, command) - # We need to encode every keyword argument to a simple string, not - # the unicode one, because ** expansion does not support it. - for index, (key, value) in enumerate(opts): - if isinstance(key, UnicodeType): - opts[index] = (key.encode(KEY_ENCODING), value) - # Inject the source arguments as a string as a first argument, if # command has enabled the corresponding option. if command.source: diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/check_paths.py --- a/src/common/check_paths.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/check_paths.py Tue Jan 01 21:06:16 2013 +0100 @@ -29,7 +29,7 @@ import stat from common import gajim -import logger +from common import logger from common import jingle_xtls # DO NOT MOVE ABOVE OF import gajim diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/commands.py --- a/src/common/commands.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/commands.py Tue Jan 01 21:06:16 2013 +0100 @@ -23,9 +23,9 @@ ## import nbxmpp -import helpers -import dataforms -import gajim +from common import helpers +from common import dataforms +from common import gajim import logging log = logging.getLogger('gajim.c.commands') diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/configpaths.py --- a/src/common/configpaths.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/configpaths.py Tue Jan 01 21:06:16 2013 +0100 @@ -61,7 +61,7 @@ """ Convert from filesystem encoding if not already Unicode """ - return unicode(s, sys.getfilesystemencoding()) + return s def windowsify(s): if os.name == 'nt': diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/connection.py --- a/src/common/connection.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/connection.py Tue Jan 01 21:06:16 2013 +0100 @@ -616,7 +616,7 @@ if realm == '': if event == nbxmpp.transports_nb.DATA_RECEIVED: gajim.nec.push_incoming_event(StanzaReceivedEvent(None, - conn=self, stanza_str=unicode(data, errors='ignore'))) + conn=self, stanza_str=data)) elif event == nbxmpp.transports_nb.DATA_SENT: gajim.nec.push_incoming_event(StanzaSentEvent(None, conn=self, stanza_str=data)) @@ -1446,7 +1446,7 @@ self.connection.send(' ') def _on_xmpp_ping_answer(self, iq_obj): - id_ = unicode(iq_obj.getAttr('id')) + id_ = iq_obj.getAttr('id') assert id_ == self.awaiting_xmpp_ping_id self.awaiting_xmpp_ping_id = None @@ -1607,7 +1607,7 @@ self.activate_privacy_rule('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg - priority = unicode(gajim.get_priority(self.name, 'invisible')) + priority = gajim.get_priority(self.name, 'invisible') p = nbxmpp.Presence(priority=priority) p = self.add_sha(p, True) if msg: @@ -1781,7 +1781,7 @@ p.setStatus(msg) else: signed = self.get_signed_presence(msg) - priority = unicode(gajim.get_priority(self.name, sshow)) + priority = gajim.get_priority(self.name, sshow) p = nbxmpp.Presence(typ=None, priority=priority, show=sshow, to=jid) p = self.add_sha(p) if msg: @@ -1805,7 +1805,7 @@ def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show) - priority = unicode(gajim.get_priority(self.name, xmpp_show)) + priority = gajim.get_priority(self.name, xmpp_show) p = nbxmpp.Presence(typ=None, priority=priority, show=xmpp_show) p = self.add_sha(p) if msg: diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/connection_handlers.py Tue Jan 01 21:06:16 2013 +0100 @@ -39,7 +39,7 @@ from calendar import timegm import nbxmpp -import common.caps_cache as capscache +from common import caps_cache as capscache from common import helpers from common import gajim @@ -181,8 +181,8 @@ if not self.connection or self.connected < 2: return frm = helpers.get_full_jid_from_iq(iq_obj) - to = unicode(iq_obj.getAttr('to')) - id_ = unicode(iq_obj.getAttr('id')) + to = iq_obj.getAttr('to') + id_ = iq_obj.getAttr('id') iq = nbxmpp.Iq(to=frm, typ='result', queryNS=nbxmpp.NS_DISCO, frm=to) iq.setAttr('id', id_) query = iq.setTag('query') @@ -235,7 +235,7 @@ if self.commandInfoQuery(con, iq_obj): raise nbxmpp.NodeProcessed - id_ = unicode(iq_obj.getAttr('id')) + id_ = iq_obj.getAttr('id') if id_[:6] == 'Gajim_': # We get this request from echo.server raise nbxmpp.NodeProcessed diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/connection_handlers_events.py Tue Jan 01 21:06:16 2013 +0100 @@ -39,7 +39,7 @@ from common.jingle_transport import JingleTransportSocks5 from common.file_props import FilesProp -import gtkgui_helpers +from . import gtkgui_helpers import logging log = logging.getLogger('gajim.c.connection_handlers_events') @@ -1169,7 +1169,6 @@ self.fjid = key break - self.fjid = unicode(self.fjid) self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) def generate(self): @@ -1986,7 +1985,7 @@ self.FT_content.session.ourjid) self.FT_content.transport.set_connection( self.FT_content.session.connection) - sid = unicode(self.stanza.getTag('jingle').getAttr('sid')) + sid = self.stanza.getTag('jingle').getAttr('sid') self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) self.file_props.transport_sid = self.FT_content.transport.sid self.FT_content.file_props = self.file_props @@ -2033,8 +2032,7 @@ else: si = self.stanza.getTag('si') self.file_props = FilesProp.getNewFileProp(self.conn.name, - unicode(si.getAttr('id')) - ) + si.getAttr('id')) profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', diff -r dd54d6b1df5d -r aacbaf27ca98 src/common/dataforms.py --- a/src/common/dataforms.py Tue Jan 01 19:44:25 2013 +0100 +++ b/src/common/dataforms.py Tue Jan 01 21:06:16 2013 +0100 @@ -27,7 +27,7 @@ """ import nbxmpp -import helpers +from common import helpers # exceptions used in this module # base class @@ -345,7 +345,7 @@ @nested_property def value(): """

1 0

gajim: fix exception handling
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset e479aa48ab71 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e479aa48ab71 description: fix exception handling diffstat: plugins/dbus_plugin/plugin.py | 2 +- src/command_system/framework.py | 2 +- src/command_system/implementation/middleware.py | 4 +- src/common/check_paths.py | 2 +- src/common/configpaths.py | 2 +- src/common/connection.py | 2 +- src/common/connection_handlers.py | 6 +- src/common/connection_handlers_events.py | 6 +- src/common/contacts.py | 2 +- src/common/dbus_support.py | 2 +- src/common/ged.py | 4 +- src/common/helpers.py | 10 ++-- src/common/idle.py | 2 +- src/common/jingle_rtp.py | 6 +- src/common/jingle_xtls.py | 4 +- src/common/logger.py | 44 ++++++++++++------------ src/common/optparser.py | 8 ++-- src/common/passwords.py | 2 +- src/common/proxy65_manager.py | 4 +- src/common/rst_xhtml_generator.py | 2 +- src/common/socks5.py | 38 ++++++++++---------- src/common/zeroconf/client_zeroconf.py | 8 ++-- src/common/zeroconf/zeroconf_avahi.py | 12 +++--- src/common/zeroconf/zeroconf_bonjour.py | 8 ++-- src/config.py | 12 +++--- src/conversation_textview.py | 2 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 6 +- src/disco.py | 4 +- src/gtkgui_helpers.py | 10 ++-- src/gui_interface.py | 6 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 4 +- src/notify.py | 10 ++-- src/plugins/gui.py | 6 +- src/plugins/pluginmanager.py | 24 ++++++------ src/plugins/plugins_i18n.py | 2 +- src/profile_window.py | 2 +- src/remote_control.py | 2 +- src/roster_window.py | 2 +- src/session.py | 14 +++--- test/integration/test_xmpp_transports_nb.py | 2 +- test/runtests.py | 2 +- 44 files changed, 149 insertions(+), 149 deletions(-) diffs (truncated from 1388 to 300 lines): diff -r aacbaf27ca98 -r e479aa48ab71 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Tue Jan 01 21:06:16 2013 +0100 +++ b/plugins/dbus_plugin/plugin.py Tue Jan 01 23:18:36 2013 +0100 @@ -508,7 +508,7 @@ def prefs_store(self): try: gajim.interface.save_config() - except Exception, e: + except Exception as e: return DBUS_BOOLEAN(False) return DBUS_BOOLEAN(True) diff -r aacbaf27ca98 -r e479aa48ab71 src/command_system/framework.py --- a/src/command_system/framework.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/command_system/framework.py Tue Jan 01 23:18:36 2013 +0100 @@ -165,7 +165,7 @@ # command or name attributes set. They will be set to a # corresponding values right here in case if they was not set by # the one who raised an exception. - except CommandError, error: + except CommandError as error: if not error.command and not error.name: raise CommandError(error.message, self) raise diff -r aacbaf27ca98 -r e479aa48ab71 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/command_system/implementation/middleware.py Tue Jan 01 23:18:36 2013 +0100 @@ -62,13 +62,13 @@ try: parents = super(ChatCommandProcessor, self) parents.execute_command(name, arguments) - except NoCommandError, error: + except NoCommandError as error: details = dict(name=error.name, message=error.message) message = "%(name)s: %(message)s\n" % details message += "Try using the //%(name)s or /say /%(name)s " % details message += "construct if you intended to send it as a text." self.echo_error(message) - except CommandError, error: + except CommandError as error: self.echo_error("%s: %s" % (error.name, error.message)) except Exception: self.echo_error(_("Error during command execution!")) diff -r aacbaf27ca98 -r e479aa48ab71 src/common/check_paths.py --- a/src/common/check_paths.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/check_paths.py Tue Jan 01 23:18:36 2013 +0100 @@ -161,7 +161,7 @@ con.commit() cur.executescript('DROP TABLE %s;' % table) con.commit() - except sqlite.OperationalError, e: + except sqlite.OperationalError as e: print('error moving table %s to cache.db: %s' % (table, str(e)), file=sys.stderr) con.close() diff -r aacbaf27ca98 -r e479aa48ab71 src/common/configpaths.py --- a/src/common/configpaths.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/configpaths.py Tue Jan 01 23:18:36 2013 +0100 @@ -161,7 +161,7 @@ windowsify('plugins'))) try: self.add('TMP', None, fse(tempfile.gettempdir())) - except IOError, e: + except IOError as e: print('Error opening tmp folder: %s\nUsing %s' % (str(e), os.path.expanduser('~')), file=sys.stderr) self.add('TMP', None, fse(os.path.expanduser('~'))) diff -r aacbaf27ca98 -r e479aa48ab71 src/common/connection.py --- a/src/common/connection.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/connection.py Tue Jan 01 23:18:36 2013 +0100 @@ -455,7 +455,7 @@ log_msg = '<body xmlns="%s">%s</body>' % ( nbxmpp.NS_XHTML, xhtml) gajim.logger.write(kind, jid, log_msg) - except exceptions.PysqliteOperationalError, e: + except exceptions.PysqliteOperationalError as e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: diff -r aacbaf27ca98 -r e479aa48ab71 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/connection_handlers.py Tue Jan 01 23:18:36 2013 +0100 @@ -331,7 +331,7 @@ fil = open(path_to_file, 'w') fil.write(str(card)) fil.close() - except IOError, e: + except IOError as e: gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Disk Write Error'), sec_txt=str(e))) @@ -947,7 +947,7 @@ gajim.config.should_log(self.name, obj.jid): try: gajim.logger.write('status', obj.jid, obj.status, obj.show) - except exceptions.PysqliteOperationalError, e: + except exceptions.PysqliteOperationalError as e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') @@ -1069,7 +1069,7 @@ try: gajim.logger.write('error', frm, error_msg, tim=tim, subject=subject) - except exceptions.PysqliteOperationalError, e: + except exceptions.PysqliteOperationalError as e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') diff -r aacbaf27ca98 -r e479aa48ab71 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/connection_handlers_events.py Tue Jan 01 23:18:36 2013 +0100 @@ -220,11 +220,11 @@ try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - except ValueError, e: + except ValueError as e: try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S.%fZ') - except ValueError, e: + except ValueError as e: log.info('Wrong time format: %s' % str(e)) return @@ -905,7 +905,7 @@ try: gajim.logger.write('gcstatus', self.fjid, st, self.show) - except exceptions.PysqliteOperationalError, e: + except exceptions.PysqliteOperationalError as e: self.conn.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: diff -r aacbaf27ca98 -r e479aa48ab71 src/common/contacts.py --- a/src/common/contacts.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/contacts.py Tue Jan 01 23:18:36 2013 +0100 @@ -32,7 +32,7 @@ from common import caps_cache from common.account import Account import common.gajim -except ImportError, e: +except ImportError as e: if __name__ != "__main__": raise ImportError(e) diff -r aacbaf27ca98 -r e479aa48ab71 src/common/dbus_support.py --- a/src/common/dbus_support.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/dbus_support.py Tue Jan 01 23:18:36 2013 +0100 @@ -154,7 +154,7 @@ return None obj = bus.get_object(interface, path) return dbus.Interface(obj, interface) - except Exception, e: + except Exception as e: gajim.log.debug(str(e)) return None diff -r aacbaf27ca98 -r e479aa48ab71 src/common/ged.py --- a/src/common/ged.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/ged.py Tue Jan 01 23:18:36 2013 +0100 @@ -79,7 +79,7 @@ if event_name in self.handlers: try: self.handlers[event_name].remove((priority, handler)) - except ValueError, error: + except ValueError as error: log.warn('''Function (%s) with priority "%s" never registered as handler of event "%s". Couldn\'t remove. Error: %s''' %(handler, priority, event_name, error)) @@ -94,7 +94,7 @@ return True except NodeProcessed: node_processed = True - except Exception, e: + except Exception as e: log.error('Error while running an even handler: %s' % \ handler) traceback.print_exc() diff -r aacbaf27ca98 -r e479aa48ab71 src/common/helpers.py --- a/src/common/helpers.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/helpers.py Tue Jan 01 23:18:36 2013 +0100 @@ -207,7 +207,7 @@ while True: try: return func(*args, **kwargs) - except (os.error, IOError, select.error), ex: + except (os.error, IOError, select.error) as ex: if ex.errno == errno.EINTR: continue else: @@ -1465,7 +1465,7 @@ req = urllib2.Request(attrs['src']) req.add_header('User-Agent', 'Gajim ' + gajim.version) f = urllib2.urlopen(req) - except Exception, ex: + except Exception as ex: log.debug('Error loading image %s ' % attrs['src'] + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') @@ -1488,7 +1488,7 @@ break try: temp = f.read(100) - except socket.timeout, ex: + except socket.timeout as ex: log.debug('Timeout loading image %s ' % attrs['src'] + str(ex)) alt = attrs.get('alt', '') if alt: @@ -1540,7 +1540,7 @@ c.close() t = b.getvalue() return (t, attrs.get('alt', '')) - except pycurl.error, ex: + except pycurl.error as ex: alt = attrs.get('alt', '') if alt: alt += '\n' @@ -1550,7 +1550,7 @@ alt += _('Timeout loading image') else: alt += _('Error loading image') - except Exception, ex: + except Exception as ex: log.debug('Error loading image %s ' % attrs['src'] + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') diff -r aacbaf27ca98 -r e479aa48ab71 src/common/idle.py --- a/src/common/idle.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/idle.py Tue Jan 01 23:18:36 2013 +0100 @@ -68,7 +68,7 @@ rootwindow = libX11.XDefaultRootWindow(dpy_p) xss_available = True -except OSError, e: +except OSError as e: # Logging? xss_available = False diff -r aacbaf27ca98 -r e479aa48ab71 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/jingle_rtp.py Tue Jan 01 23:18:36 2013 +0100 @@ -86,8 +86,8 @@ try: ip = socket.getaddrinfo(stun_server, 0, socket.AF_UNSPEC, socket.SOCK_STREAM)[0][4][0] - except socket.gaierror, (errnum, errstr): - log.warn('Lookup of stun ip failed: %s' % errstr) + except socket.gaierror as e: + log.warn('Lookup of stun ip failed: %s' % str(e)) else: params['stun-ip'] = ip @@ -104,7 +104,7 @@ try: bin = gst.parse_bin_from_description(pipeline, True) return bin - except GError, error_str: + except GError as error_str: gajim.nec.push_incoming_event(InformationEvent(None, conn=self.session.connection, level='error', pri_txt=_('%s configuration error') % text.capitalize(), diff -r aacbaf27ca98 -r e479aa48ab71 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/jingle_xtls.py Tue Jan 01 23:18:36 2013 +0100 @@ -63,7 +63,7 @@ return try: f = open(cert_path) - except IOError, e: + except IOError as e: log.warning('Unable to open certificate file %s: %s' % (cert_path, str(e))) return @@ -79,7 +79,7 @@ x509cert = OpenSSL.crypto.load_certificate( OpenSSL.crypto.FILETYPE_PEM, cert) cert_store.add_cert(x509cert) - except OpenSSL.crypto.Error, exception_obj: + except OpenSSL.crypto.Error as exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ (cert_path, exception_obj.args[0][0][2])) except: diff -r aacbaf27ca98 -r e479aa48ab71 src/common/logger.py --- a/src/common/logger.py Tue Jan 01 21:06:16 2013 +0100 +++ b/src/common/logger.py Tue Jan 01 23:18:36 2013 +0100 @@ -149,7 +149,7 @@ def attach_cache_database(self): try: self.cur.execute("ATTACH DATABASE '%s' AS cache" % CACHE_DB_PATH) - except sqlite.Error, e: + except sqlite.Error as e: log.debug("Failed to attach cache database: %s" % str(e)) def set_synchronous(self, sync): @@ -158,7 +158,7 @@ self.cur.execute("PRAGMA synchronous = NORMAL") else: self.cur.execute("PRAGMA synchronous = OFF")

1 0

gajim: python uses unicode internally
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset dd54d6b1df5d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd54d6b1df5d description: python uses unicode internally diffstat: src/adhoc_commands.py | 4 +- src/advanced_configuration_window.py | 32 +++--- src/atom_window.py | 6 +- src/chat_control.py | 4 +- src/common/atom.py | 6 +- src/common/check_paths.py | 32 +++--- src/common/commands.py | 18 +- src/common/configpaths.py | 60 ++++++------ src/common/connection_handlers.py | 2 +- src/common/dataforms.py | 8 +- src/common/helpers.py | 21 +-- src/common/i18n.py | 8 +- src/common/kwalletbinding.py | 2 +- src/common/logger.py | 5 +- src/common/optparser.py | 4 +- src/common/rst_xhtml_generator.py | 4 +- src/config.py | 133 ++++++++++++-------------- src/dataforms_widget.py | 6 +- src/dialogs.py | 91 ++++++++--------- src/disco.py | 52 +++++----- src/features_window.py | 2 +- src/filetransfers_window.py | 20 ++-- src/gajim_themes_window.py | 5 +- src/groupchat_control.py | 32 +++--- src/gtkgui_helpers.py | 6 +- src/gui_interface.py | 6 +- src/history_manager.py | 14 +- src/history_window.py | 4 +- src/htmltextview.py | 4 +- src/plugins/gui.py | 2 +- src/plugins/plugin.py | 10 +- src/profile_window.py | 4 +- src/roster_window.py | 175 +++++++++++++++++----------------- src/statusicon.py | 2 +- test/integration/test_roster.py | 4 +- test/lib/data.py | 90 +++++++++--------- test/unit/test_jingle.py | 78 +++++++------- test/unit/test_xmpp_transports_nb.py | 30 +++--- 38 files changed, 482 insertions(+), 504 deletions(-) diffs (truncated from 3141 to 300 lines): diff -r 0086c1032eaa -r dd54d6b1df5d src/adhoc_commands.py --- a/src/adhoc_commands.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/adhoc_commands.py Tue Jan 01 19:44:25 2013 +0100 @@ -452,7 +452,7 @@ note = command.getTag('note') if note: - self.notes_label.set_text(note.getData().decode('utf-8')) + self.notes_label.set_text(note.getData()) self.notes_label.set_no_show_all(False) self.notes_label.show() else: @@ -510,7 +510,7 @@ try: errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid) errordesc = nbxmpp.ERRORS[errorname][2] - error = errordesc.decode('utf-8') + error = errordesc del errorname, errordesc except KeyError: # when stanza doesn't have error description error = _('Service returned an error.') diff -r 0086c1032eaa -r dd54d6b1df5d src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/advanced_configuration_window.py Tue Jan 01 19:44:25 2013 +0100 @@ -141,8 +141,7 @@ """ optname = model[iter_][C_PREFNAME] opttype = model[iter_][C_TYPE] - - if opttype.decode('utf-8') == self.types['boolean'] or optname == 'password': + if opttype == self.types['boolean'] or optname == 'password': cell.set_property('editable', False) else: cell.set_property('editable', True) @@ -153,10 +152,10 @@ # path[1] is the key name # path[2] is the root of tree # last two is optional - path = [model[iter_][0].decode('utf-8')] + path = [model[iter_][0]] parent = model.iter_parent(iter_) while parent: - path.append(model[parent][0].decode('utf-8')) + path.append(model[parent][0]) parent = model.iter_parent(parent) return path @@ -194,17 +193,17 @@ def on_advanced_treeview_row_activated(self, treeview, path, column): modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') - if modelrow[2].decode('utf-8') == self.types['boolean']: + option = modelrow[0] + if modelrow[2] == self.types['boolean']: for key in self.right_true_dict.keys(): - if self.right_true_dict[key] == modelrow[1].decode('utf-8'): + if self.right_true_dict[key] == modelrow[1]: modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] if len(modelpath.get_indices()) > 1: optnamerow = self.model[modelpath.get_indices()[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath.get_indices()[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval) gajim.config.set_per(optname, key, option, newval) @@ -234,13 +233,12 @@ modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] modelpath = modelpath.get_indices() - option = modelrow[0].decode('utf-8') - text = text.decode('utf-8') + option = modelrow[0] if len(modelpath) > 1: optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], text) gajim.config.set_per(optname, key, option, text) @@ -269,12 +267,12 @@ return modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') + option = modelrow[0] if len(modelpath) > 1: optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[C_VALUE], default) gajim.config.set_per(optname, key, option, default) @@ -317,7 +315,7 @@ self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter, data): - search_string = self.entry.get_text().decode('utf-8').lower() + search_string = self.entry.get_text().lower() for it in tree_model_pre_order(model, treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it) diff -r 0086c1032eaa -r dd54d6b1df5d src/atom_window.py --- a/src/atom_window.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/atom_window.py Tue Jan 01 19:44:25 2013 +0100 @@ -84,20 +84,20 @@ # fill the fields if newentry.feed_link is not None: self.feed_title_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.feed_title)) else: self.feed_title_label.set_markup( GObject.markup_escape_text(newentry.feed_title)) self.feed_tagline_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.feed_tagline)) if newentry.title: if newentry.uri is not None: self.entry_title_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.title)) else: self.entry_title_label.set_markup( diff -r 0086c1032eaa -r dd54d6b1df5d src/chat_control.py --- a/src/chat_control.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/chat_control.py Tue Jan 01 19:44:25 2013 +0100 @@ -620,7 +620,7 @@ message_buffer = self.msg_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() - message = message_buffer.get_text(start_iter, end_iter, False).decode('utf-8') + message = message_buffer.get_text(start_iter, end_iter, False) xhtml = self.msg_textview.get_xhtml() # send the message @@ -2842,7 +2842,7 @@ type_ = model[iter_][2] if type_ != 'contact': # source is not a contact return - dropped_jid = data.decode('utf-8') + dropped_jid = data dropped_transport = gajim.get_transport_name_from_jid(dropped_jid) c_transport = gajim.get_transport_name_from_jid(c.jid) diff -r 0086c1032eaa -r dd54d6b1df5d src/common/atom.py --- a/src/common/atom.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/common/atom.py Tue Jan 01 19:44:25 2013 +0100 @@ -100,13 +100,13 @@ if main_feed is not None and source_feed is not None: - return u'%s: %s' % (main_feed, source_feed) + return '%s: %s' % (main_feed, source_feed) elif main_feed is not None: return main_feed elif source_feed is not None: return source_feed else: - return u'' + return '' feed_title = property(get_feed_title, None, None, ''' Title of feed. It is built from entry''s original feed title and title of feed @@ -173,4 +173,4 @@ updated = property(get_updated, None, None, ''' Last significant modification time. ''') - feed_tagline = u'' + feed_tagline = '' diff -r 0086c1032eaa -r dd54d6b1df5d src/common/check_paths.py --- a/src/common/check_paths.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/common/check_paths.py Tue Jan 01 19:44:25 2013 +0100 @@ -133,11 +133,11 @@ try: import configpaths OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse( - os.environ[u'appdata']), u'Gajim') + os.environ['appdata']), 'Gajim') except KeyError: - OLD_LOG_DB_FOLDER = u'.' + OLD_LOG_DB_FOLDER = '.' else: - OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim') + OLD_LOG_DB_FOLDER = os.path.expanduser('~/.gajim') tmp = logger.CACHE_DB_PATH logger.CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db') @@ -148,7 +148,7 @@ os.chdir(back) cur = con.cursor() cur.execute('''SELECT name FROM sqlite_master WHERE type = 'table';''') - tables = cur.fetchall() # we get [(u'jids',), (u'unread_messages',), ... + tables = cur.fetchall() # we get [('jids',), ('unread_messages',), ... tables = [t[0] for t in tables] cur.execute("ATTACH DATABASE '%s' AS cache" % logger.CACHE_DB_PATH) for table in ('caps_cache', 'rooms_last_message_time', 'roster_entry', @@ -189,22 +189,22 @@ if os.name == 'nt': try: OLD_LOG_DB_FOLDER = os.path.join(configpaths.fse( - os.environ[u'appdata']), u'Gajim') + os.environ['appdata']), 'Gajim') except KeyError: - OLD_LOG_DB_FOLDER = u'.' + OLD_LOG_DB_FOLDER = '.' else: - OLD_LOG_DB_FOLDER = os.path.expanduser(u'~/.gajim') + OLD_LOG_DB_FOLDER = os.path.expanduser('~/.gajim') if not os.path.exists(OLD_LOG_DB_FOLDER): return - OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'logs.db') - OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, u'cache.db') - vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'vcards') - vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'avatars') - vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'emoticons') - vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'iconsets') - vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, u'moods') + OLD_LOG_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'logs.db') + OLD_CACHE_DB_PATH = os.path.join(OLD_LOG_DB_FOLDER, 'cache.db') + vars['OLD_VCARD_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'vcards') + vars['OLD_AVATAR_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'avatars') + vars['OLD_MY_EMOTS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'emoticons') + vars['OLD_MY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'iconsets') + vars['OLD_MY_MOOD_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, 'moods') vars['OLD_MY_ACTIVITY_ICONSETS_PATH'] = os.path.join(OLD_LOG_DB_FOLDER, - u'activities') + 'activities') OLD_CONFIG_FILES = [] OLD_DATA_FILES = [] for f in os.listdir(OLD_LOG_DB_FOLDER): @@ -345,7 +345,7 @@ print(_('%s is a directory but should be a file') % CACHE_DB_PATH) print(_('Gajim will now exit')) sys.exit() - + if not os.path.exists(XTLS_CERTS): create_path(XTLS_CERTS) if not os.path.exists(LOCAL_XTLS_CERTS): diff -r 0086c1032eaa -r dd54d6b1df5d src/common/commands.py --- a/src/common/commands.py Tue Jan 01 19:36:56 2013 +0100 +++ b/src/common/commands.py Tue Jan 01 19:44:25 2013 +0100 @@ -104,12 +104,12 @@ var = 'presence-type', label = 'Type of presence:', options = [ - (u'chat', _('Free for chat')), - (u'online', _('Online')), - (u'away', _('Away')), - (u'xa', _('Extended away')), - (u'dnd', _('Do not disturb')), - (u'offline', _('Offline - disconnect'))], + ('chat', _('Free for chat')), + ('online', _('Online')), + ('away', _('Away')), + ('xa', _('Extended away')), + ('dnd', _('Do not disturb')), + ('offline', _('Offline - disconnect'))], value = 'online', required = True), dataforms.Field('text-multi', @@ -146,7 +146,7 @@ try: presencedesc = form['presence-desc'].value except Exception: # same exceptions as in last comment - presencedesc = u'' + presencedesc = '' response, cmd = self.buildResponse(request, status = 'completed') cmd.addChild('note', {}, _('The status has been changed.')) @@ -197,7 +197,7 @@ options = [] account = self.connection.name for gc in find_current_groupchats(account): - options.append((u'%s' %(gc[0]), _('%(nickname)s on %(room_jid)s') % \ + options.append(('%s' %(gc[0]), _('%(nickname)s on %(room_jid)s') % \ {'nickname': gc[1], 'room_jid': gc[0]})) if not len(options): response, cmd = self.buildResponse(request, status = 'completed') @@ -367,7 +367,7 @@ if cmd.isVisibleFor(self.isSameJID(jid)): q.addChild('item', { # TODO: find the jid - 'jid': self.getOurBareJID() + u'/' + self.server_resource,

1 0

gajim: print -> print()
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 0086c1032eaa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0086c1032eaa description: print -> print() diffstat: src/adhoc_commands.py | 2 +- src/common/check_paths.py | 54 ++++++++++---------- src/common/configpaths.py | 4 +- src/common/connection_handlers.py | 4 +- src/common/connection_handlers_events.py | 8 +- src/common/dbus_support.py | 16 +++--- src/common/idle.py | 4 +- src/common/jingle_transport.py | 2 +- src/common/logger.py | 4 +- src/common/logging_helpers.py | 4 +- src/common/multimedia_helpers.py | 2 +- src/common/optparser.py | 5 +- src/common/resolver.py | 2 +- src/common/rst_xhtml_generator.py | 12 ++-- src/common/zeroconf/roster_zeroconf.py | 12 ---- src/dataforms_widget.py | 2 +- src/dialogs.py | 1 - src/gajim-remote.py | 27 +++++---- src/gajim.py | 28 +++++----- src/gtkgui_helpers.py | 14 ++-- src/gui_interface.py | 4 +- src/ipython_view.py | 4 +- src/music_track_listener.py | 8 +- test/integration/test_resolver.py | 2 +- test/integration/test_xmpp_client_nb.py | 2 +- test/runtests.py | 8 +- test/unit/test_socks5.py | 84 ++++++++++++++++---------------- 27 files changed, 154 insertions(+), 165 deletions(-) diffs (truncated from 1009 to 300 lines): diff -r 093f965f539c -r 0086c1032eaa src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/adhoc_commands.py Tue Jan 01 19:36:56 2013 +0100 @@ -159,7 +159,7 @@ return self.stage_adhoc_commands_window_delete_event(self.window) def __del__(self): - print 'Object has been deleted.' + print('Object has been deleted.') # stage 1: waiting for command list def stage1(self): diff -r 093f965f539c -r 0086c1032eaa src/common/check_paths.py --- a/src/common/check_paths.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/check_paths.py Tue Jan 01 19:36:56 2013 +0100 @@ -36,7 +36,7 @@ import sqlite3 as sqlite def create_log_db(): - print _('creating logs database') + print(_('creating logs database')) con = sqlite.connect(logger.LOG_DB_PATH) os.chmod(logger.LOG_DB_PATH, 0600) # rw only for us cur = con.cursor() @@ -84,7 +84,7 @@ con.close() def create_cache_db(): - print _('creating cache database') + print(_('creating cache database')) con = sqlite.connect(logger.CACHE_DB_PATH) os.chmod(logger.CACHE_DB_PATH, 0600) # rw only for us cur = con.cursor() @@ -128,7 +128,7 @@ con.close() def split_db(): - print 'spliting database' + print('spliting database') if os.name == 'nt': try: import configpaths @@ -162,8 +162,8 @@ cur.executescript('DROP TABLE %s;' % table) con.commit() except sqlite.OperationalError, e: - print >> sys.stderr, 'error moving table %s to cache.db: %s' % \ - (table, str(e)) + print('error moving table %s to cache.db: %s' % (table, str(e)), + file=sys.stderr) con.close() logger.CACHE_DB_PATH = tmp @@ -249,7 +249,7 @@ continue if not os.path.exists(src): continue - print 'moving %s to %s' % (src, dst) + print(_('moving %s to %s') % (src, dst)) shutil.move(src, dst) gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -275,57 +275,57 @@ if not os.path.exists(MY_DATA): create_path(MY_DATA) elif os.path.isfile(MY_DATA): - print _('%s is a file but it should be a directory') % MY_DATA - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % MY_DATA) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(MY_CONFIG): create_path(MY_CONFIG) elif os.path.isfile(MY_CONFIG): - print _('%s is a file but it should be a directory') % MY_CONFIG - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % MY_CONFIG) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(MY_CACHE): create_path(MY_CACHE) elif os.path.isfile(MY_CACHE): - print _('%s is a file but it should be a directory') % MY_CACHE - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % MY_CACHE) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(VCARD_PATH): create_path(VCARD_PATH) elif os.path.isfile(VCARD_PATH): - print _('%s is a file but it should be a directory') % VCARD_PATH - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % VCARD_PATH) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(AVATAR_PATH): create_path(AVATAR_PATH) elif os.path.isfile(AVATAR_PATH): - print _('%s is a file but it should be a directory') % AVATAR_PATH - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % AVATAR_PATH) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(LOG_DB_FOLDER): create_path(LOG_DB_FOLDER) elif os.path.isfile(LOG_DB_FOLDER): - print _('%s is a file but it should be a directory') % LOG_DB_FOLDER - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % LOG_DB_FOLDER) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(PLUGINS_CONFIG_PATH): create_path(PLUGINS_CONFIG_PATH) elif os.path.isfile(PLUGINS_CONFIG_PATH): - print _('%s is a file but it should be a directory') % PLUGINS_CONFIG_PATH - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % PLUGINS_CONFIG_PATH) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(CACHE_DB_FOLDER): create_path(CACHE_DB_FOLDER) elif os.path.isfile(CACHE_DB_FOLDER): - print _('%s is a file but it should be a directory') % CACHE_DB_FOLDER - print _('Gajim will now exit') + print(_('%s is a file but it should be a directory') % CACHE_DB_FOLDER) + print(_('Gajim will now exit')) sys.exit() check_and_possibly_move_config() @@ -334,16 +334,16 @@ create_log_db() gajim.logger.init_vars() elif os.path.isdir(LOG_DB_PATH): - print _('%s is a directory but should be a file') % LOG_DB_PATH - print _('Gajim will now exit') + print(_('%s is a directory but should be a file') % LOG_DB_PATH) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(CACHE_DB_PATH): create_cache_db() gajim.logger.attach_cache_database() elif os.path.isdir(CACHE_DB_PATH): - print _('%s is a directory but should be a file') % CACHE_DB_PATH - print _('Gajim will now exit') + print(_('%s is a directory but should be a file') % CACHE_DB_PATH) + print(_('Gajim will now exit')) sys.exit() if not os.path.exists(XTLS_CERTS): @@ -363,5 +363,5 @@ create_path(head) if os.path.exists(directory): return - print _('creating %s directory') % directory + print(('creating %s directory') % directory) os.mkdir(directory, 0700) diff -r 093f965f539c -r 0086c1032eaa src/common/configpaths.py --- a/src/common/configpaths.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/configpaths.py Tue Jan 01 19:36:56 2013 +0100 @@ -162,8 +162,8 @@ try: self.add('TMP', None, fse(tempfile.gettempdir())) except IOError, e: - print >> sys.stderr, 'Error opening tmp folder: %s\nUsing %s' % ( - str(e), os.path.expanduser('~')) + print('Error opening tmp folder: %s\nUsing %s' % (str(e), + os.path.expanduser('~')), file=sys.stderr) self.add('TMP', None, fse(os.path.expanduser('~'))) try: diff -r 093f965f539c -r 0086c1032eaa src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/connection_handlers.py Tue Jan 01 19:36:56 2013 +0100 @@ -593,7 +593,7 @@ elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: # TODO - print 'ARCHIVING_COLLECTIONS_ARRIVED' + print('ARCHIVING_COLLECTIONS_ARRIVED') elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED: def save_if_not_exists(with_, nick, direction, tim, payload): @@ -603,7 +603,7 @@ gajim.logger.save_if_not_exists(with_, direction, tim, msg=payload[0].getData(), nick=nick) elif payload[0].getName() == 'message': - print 'Not implemented' + print('Not implemented') chat = iq_obj.getTag('chat') if chat: with_ = chat.getAttr('with') diff -r 093f965f539c -r 0086c1032eaa src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/connection_handlers_events.py Tue Jan 01 19:36:56 2013 +0100 @@ -366,10 +366,10 @@ try: j = helpers.parse_jid(jid) except Exception: - print >> sys.stderr, _('JID %s is not RFC compliant. It ' - 'will not be added to your roster. Use roster ' - 'management tools such as ' - 'http://jru.jabberstudio.org/ to remove it') % jid + print(_('JID %s is not RFC compliant. It will not be added ' + 'to your roster. Use roster management tools such as ' + 'http://jru.jabberstudio.org/ to remove it') % jid, + file=sys.stderr) else: infos = raw_roster[jid] if jid != our_jid and (not infos['subscription'] or \ diff -r 093f965f539c -r 0086c1032eaa src/common/dbus_support.py --- a/src/common/dbus_support.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/dbus_support.py Tue Jan 01 19:36:56 2013 +0100 @@ -38,8 +38,8 @@ except ImportError: supported = False if not os.name == 'nt': # only say that to non Windows users - print _('D-Bus python bindings are missing in this computer') - print _('D-Bus capabilities of Gajim cannot be used') + print(_('D-Bus python bindings are missing in this computer')) + print(_('D-Bus capabilities of Gajim cannot be used')) else: try: # test if dbus-x11 is installed @@ -49,14 +49,14 @@ except dbus.DBusException: supported = False if not os.name == 'nt': # only say that to non Windows users - print _('D-Bus does not run correctly on this machine') - print _('D-Bus capabilities of Gajim cannot be used') + print(_('D-Bus does not run correctly on this machine')) + print(_('D-Bus capabilities of Gajim cannot be used')) except exceptions.SystemBusNotPresent: - print _('D-Bus does not run correctly on this machine: system bus not ' - 'present') + print(_('D-Bus does not run correctly on this machine: system bus not ' + 'present')) except exceptions.SessionBusNotPresent: - print _('D-Bus does not run correctly on this machine: session bus not ' - 'present') + print(_('D-Bus does not run correctly on this machine: session bus not ' + 'present')) class SystemBus: """ diff -r 093f965f539c -r 0086c1032eaa src/common/idle.py --- a/src/common/idle.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/idle.py Tue Jan 01 19:36:56 2013 +0100 @@ -94,6 +94,6 @@ if __name__ == '__main__': import time time.sleep(2.1) - print getIdleSec() + print(getIdleSec()) close() - print getIdleSec() + print(getIdleSec()) diff -r 093f965f539c -r 0086c1032eaa src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/jingle_transport.py Tue Jan 01 19:36:56 2013 +0100 @@ -401,7 +401,7 @@ if 'type' in candidate and candidate['type'] in types: cand.type = types[candidate['type']] else: - print 'Unknown type %s', candidate['type'] + print('Unknown type %s' % candidate['type']) candidates.append(cand) self.remote_candidates.extend(candidates) return candidates diff -r 093f965f539c -r 0086c1032eaa src/common/logger.py --- a/src/common/logger.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/logger.py Tue Jan 01 19:36:56 2013 +0100 @@ -169,7 +169,7 @@ try: self.con.commit() except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + print(str(e), file=sys.stderr) self.commit_timout_id = None return False @@ -415,7 +415,7 @@ self.con.commit() message_id = self.cur.lastrowid except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + print(str(e), file=sys.stderr) else: self._timeout_commit() if message_id: diff -r 093f965f539c -r 0086c1032eaa src/common/logging_helpers.py --- a/src/common/logging_helpers.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/common/logging_helpers.py Tue Jan 01 19:36:56 2013 +0100

1 0

python-nbxmpp: fix encoding issues (base64, HMAC, ...)
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset 9f4a4fe90ae6 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=9f4a4fe90ae6 description: fix encoding issues (base64, HMAC, ...) diffstat: nbxmpp/auth_nb.py | 44 ++++++++++++++++++++++++++------------------ nbxmpp/dispatcher_nb.py | 24 ++++++++++++++---------- nbxmpp/proxy_connectors.py | 6 ++++-- nbxmpp/simplexml.py | 2 +- nbxmpp/tls_nb.py | 6 ++++-- 5 files changed, 49 insertions(+), 33 deletions(-) diffs (242 lines): diff -r 220e1936c4d2 -r 9f4a4fe90ae6 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Wed Jan 02 14:15:21 2013 +0100 +++ b/nbxmpp/auth_nb.py Wed Jan 02 15:36:55 2013 +0100 @@ -219,8 +219,8 @@ if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') sasl_data = '%s@%s' % (self.username, self._owner.Server) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) self.mechanism = 'EXTERNAL' @@ -285,10 +285,15 @@ return def scram_base64(s): - return ''.join(s.encode('base64').split('\n')) + try: + s = s.encode('utf-8') + except: + pass + return ''.join(base64.b64encode(s).decode('utf-8').\ + split('\n')) incoming_data = challenge.getData() - data=base64.decodestring(incoming_data) + data=base64.b64decode(incoming_data.encode('utf-8')).decode('utf-8') ### Handle Auth result def on_auth_fail(reason): log.info('Failed SASL authentification: %s' % reason) @@ -361,11 +366,11 @@ hashfn = hashlib.sha1 def HMAC(k, s): - return hmac.HMAC(key=k, msg=s, digestmod=hashfn).digest() + return hmac.new(key=k, msg=s, digestmod=hashfn).digest() def XOR(x, y): - r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) - return ''.join(r) + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 @@ -373,7 +378,7 @@ s = s.encode('utf-8') except: pass - ui_1 = HMAC(s, salt + '\0\0\0\01') + ui_1 = HMAC(s, (salt + '\0\0\0\01').encode('utf-8')) ui = ui_1 for i in range(iters - 1): ii += 1 @@ -393,16 +398,18 @@ r = 'c=' + scram_base64(self.scram_gs2) r += ',r=' + data['r'] self.scram_soup += r - salt = data['s'].decode('base64') + self.scram_soup = self.scram_soup.encode('utf-8') + salt = base64.b64decode(data['s'].encode('utf-8')).decode( + 'utf-8') iter = int(data['i']) SaltedPassword = Hi(self.password, salt, iter) # TODO: Could cache this, along with salt+iter. - ClientKey = HMAC(SaltedPassword, 'Client Key') + ClientKey = HMAC(SaltedPassword, b'Client Key') StoredKey = scram_H(ClientKey) ClientSignature = HMAC(StoredKey, self.scram_soup) ClientProof = XOR(ClientKey, ClientSignature) r += ',p=' + scram_base64(ClientProof) - ServerKey = HMAC(SaltedPassword, 'Server Key') + ServerKey = HMAC(SaltedPassword, b'Server Key') self.scram_ServerSignature = HMAC(ServerKey, self.scram_soup) sasl_data = scram_base64(r) node = Node('response', attrs={'xmlns': NS_SASL}, @@ -412,7 +419,8 @@ if self.scram_step == 1: data = scram_parse(data) - if data['v'].decode('base64') != self.scram_ServerSignature: + if base64.b64decode(data['v'].encode('utf-8')).decode('utf-8') \ + != self.scram_ServerSignature: # TODO: Not clear what to do here - need to abort. raise Exception node = Node('response', attrs={'xmlns': NS_SASL}); @@ -468,8 +476,8 @@ itertools.repeat(random.randint, 7)) self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. - sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n', '') + sasl_data = base64.b64encode((self.scram_gs2 + self.scram_soup).\ + encode('utf-8')).decode('utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': @@ -493,14 +501,14 @@ sasl_data += "%s=%s," % (key, self.resp[key]) else: sasl_data += '%s="%s",' % (key, self.resp[key]) - sasl_data = sasl_data[:-1].encode('utf-8').encode('base64').replace( - '\r', '').replace('\n', '') + sasl_data = base64.b64encode(sasl_data[:-1].encode('utf-8')).\ + decode('utf-8').replace('\r', '').replace('\n', '') node = Node('response', attrs={'xmlns': NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': sasl_data = '\x00%s\x00%s' % (self.username, self.password) - sasl_data = sasl_data.encode('utf-8').encode('base64').replace( - '\n', '') + sasl_data = base64.b64encode(sasl_data.encode('utf-8')).decode( + 'utf-8').replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, payload=[sasl_data]) elif self.mechanism == 'X-MESSENGER-OAUTH2': diff -r 220e1936c4d2 -r 9f4a4fe90ae6 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Wed Jan 02 14:15:21 2013 +0100 +++ b/nbxmpp/dispatcher_nb.py Wed Jan 02 15:36:55 2013 +0100 @@ -98,21 +98,21 @@ # \ufddo -> \ufdef range c = '\ufdd0' - r = c.encode('utf8') + r = c while (c < '\ufdef'): c = chr(ord(c) + 1) - r += '|' + c.encode('utf8') + r += '|' + c # \ufffe-\uffff, \u1fffe-\u1ffff, ..., \u10fffe-\u10ffff c = '\ufffe' - r += '|' + c.encode('utf8') - r += '|' + chr(ord(c) + 1).encode('utf8') + r += '|' + c + r += '|' + chr(ord(c) + 1) while (c < '\U0010fffe'): c = chr(ord(c) + 0x10000) - r += '|' + c.encode('utf8') - r += '|' + chr(ord(c) + 1).encode('utf8') + r += '|' + c + r += '|' + chr(ord(c) + 1) - self.invalid_chars_re = re.compile(r) + self.invalid_chars_re = re.compile(r.encode('utf-8')) def getAnID(self): global outgoingID @@ -222,7 +222,9 @@ handler(self) if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException + e = _pendingException[0](_pendingException[1]) + e.__traceback__ = _pendingException[2] + raise e try: self.Stream.Parse(data) # end stream:stream tag received @@ -239,7 +241,9 @@ return 0 if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - raise _pendingException + e = _pendingException[0](_pendingException[1]) + e.__traceback__ = _pendingException[2] + raise e if len(data) == 0: return '0' return len(data) @@ -507,7 +511,7 @@ # we have released dispatcher, so self._owner has no methods if not res: return - for (_id, _iq) in self._expected.items(): + for (_id, _iq) in list(self._expected.items()): if _iq is None: # If the expected Stanza would have arrived, ProcessNonBlocking # would have placed the reply stanza in there diff -r 220e1936c4d2 -r 9f4a4fe90ae6 nbxmpp/proxy_connectors.py --- a/nbxmpp/proxy_connectors.py Wed Jan 02 14:15:21 2013 +0100 +++ b/nbxmpp/proxy_connectors.py Wed Jan 02 15:36:55 2013 +0100 @@ -22,7 +22,8 @@ Authentication to NTLM (Microsoft implementation) proxies can be next. """ -import struct, socket, base64 +import struct, socket +from base64 import b64encode import logging log = logging.getLogger('nbxmpp.proxy_connectors') @@ -91,7 +92,8 @@ 'User-Agent: Gajim'] if self.proxy_user and self.proxy_pass: credentials = '%s:%s' % (self.proxy_user, self.proxy_pass) - credentials = base64.encodestring(credentials).strip() + credentials = b64encode(credentials.encode('utf-8')).decode( + 'utf-8').strip() connector.append('Proxy-Authorization: Basic '+credentials) connector.append('\r\n') self.onreceive(self._on_headers_sent) diff -r 220e1936c4d2 -r 9f4a4fe90ae6 nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Wed Jan 02 14:15:21 2013 +0100 +++ b/nbxmpp/simplexml.py Wed Jan 02 15:36:55 2013 +0100 @@ -163,7 +163,7 @@ for a in self.kids: 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 isinstance(a, str) or isinstance(a, str): + if isinstance(a, str): s = s + a.__str__() else: s = s + a.__str__(fancy and fancy+1) diff -r 220e1936c4d2 -r 9f4a4fe90ae6 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Wed Jan 02 14:15:21 2013 +0100 +++ b/nbxmpp/tls_nb.py Wed Jan 02 15:36:55 2013 +0100 @@ -345,6 +345,7 @@ '%s' % cert_path) begin = -1 i += 1 + f.close() def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") @@ -449,11 +450,12 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1')) + self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1').decode( + 'utf-8')) self._owner.ssl_certificate.append(cert) self._owner.ssl_errnum.append(errnum) self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert)) + OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8')) return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits