Commits

commits@gajim.org

17632 discussions

gajim: correctly open / close file when computing hash
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 4dbcf5ad36ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4dbcf5ad36ef description: correctly open / close file when computing hash diffstat: src/common/jingle_ft.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 0feccf27564d -r 4dbcf5ad36ef src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Jan 05 10:07:35 2013 +0100 +++ b/src/common/jingle_ft.py Sat Jan 05 10:09:15 2013 +0100 @@ -149,12 +149,13 @@ if self.file_props.algo == None: return try: - file_ = open(self.file_props.file_name, 'r') + file_ = open(self.file_props.file_name, 'rb') except: # can't open file return h = nbxmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) + file_.close() # DEBUG #hash_ = '1294809248109223' if not hash_:

1 0

gajim: fix some pointer in filetranfer window
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset a7dcfb80ff04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7dcfb80ff04 description: fix some pointer in filetranfer window diffstat: src/filetransfers_window.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (50 lines): diff -r e3bde1359b8f -r a7dcfb80ff04 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jan 05 09:54:17 2013 +0100 +++ b/src/filetransfers_window.py Sat Jan 05 10:07:10 2013 +0100 @@ -757,7 +757,7 @@ def on_transfers_list_motion_notify_event(self, widget, event): pointer = self.tree.get_pointer() props = widget.get_path_at_pos(int(event.x), int(event.y)) - self.height_diff = pointer[2] - int(event.y) + self.height_diff = pointer[1] - int(event.y) if self.tooltip.timeout > 0: if not props or self.tooltip.id != props[0]: self.tooltip.hide_tooltip() @@ -775,7 +775,7 @@ if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row self.tooltip.timeout = GObject.timeout_add(500, - self.show_tooltip, widget) + self.show_tooltip, widget) def on_transfers_list_leave_notify_event(self, widget=None, event=None): if event is not None: @@ -783,7 +783,7 @@ elif self.height_diff is 0: return pointer = self.tree.get_pointer() - props = self.tree.get_path_at_pos(pointer[1], pointer[2] - self.height_diff) + props = self.tree.get_path_at_pos(pointer[0], pointer[1] - self.height_diff) if self.tooltip.timeout > 0: if not props or self.tooltip.id == props[0]: self.tooltip.hide_tooltip() @@ -952,8 +952,8 @@ self.tooltip.hide_tooltip() return pointer = self.tree.get_pointer() - props = self.tree.get_path_at_pos(pointer[1], - pointer[2] - self.height_diff) + props = self.tree.get_path_at_pos(pointer[0], + pointer[1] - self.height_diff) # check if the current pointer is at the same path # as it was before setting the timeout if props and self.tooltip.id == props[0]: @@ -965,7 +965,7 @@ # position of the treeview on the screen position = widget.get_window().get_origin()[1:] self.tooltip.show_tooltip(file_props, rect.height, - position[1] + rect.y + self.height_diff) + position[1] + rect.y + self.height_diff) else: self.tooltip.hide_tooltip()

1 0

gajim: correctly close file after it's opened
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 0feccf27564d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0feccf27564d description: correctly close file after it's opened diffstat: src/common/jingle_xtls.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (19 lines): diff -r a7dcfb80ff04 -r 0feccf27564d src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Jan 05 10:07:10 2013 +0100 +++ b/src/common/jingle_xtls.py Sat Jan 05 10:07:35 2013 +0100 @@ -114,11 +114,11 @@ def send_cert(con, jid_from, sid): certpath = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) + \ '.cert' - certfile = open(certpath, 'r') certificate = '' - for line in certfile.readlines(): - if not line.startswith('-'): - certificate += line + with open(certpath, 'r') as certfile: + for line in certfile.readlines(): + if not line.startswith('-'): + certificate += line iq = nbxmpp.Iq('result', to=jid_from); iq.setAttr('id', sid)

1 0

gajim: close files after they are opened
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset e3bde1359b8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e3bde1359b8f description: close files after they are opened diffstat: src/common/jingle_xtls.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 21a5444ae76e -r e3bde1359b8f src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Jan 05 09:52:09 2013 +0100 +++ b/src/common/jingle_xtls.py Sat Jan 05 09:54:17 2013 +0100 @@ -86,6 +86,7 @@ '%s' % cert_path) begin = -1 i += 1 + f.close() def get_context(fingerprint, verify_cb=None): """

1 0

gajim: itervalues / iterkeys doesn't exist anymore
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 21a5444ae76e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21a5444ae76e description: itervalues / iterkeys doesn't exist anymore diffstat: src/command_system/framework.py | 2 +- src/command_system/implementation/standard.py | 6 +++--- src/common/configpaths.py | 2 +- src/common/jingle_session.py | 6 +++--- src/filetransfers_window.py | 2 +- src/network_manager_listener.py | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diffs (125 lines): diff -r 3c1a1ae44036 -r 21a5444ae76e src/command_system/framework.py --- a/src/command_system/framework.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/command_system/framework.py Sat Jan 05 09:52:09 2013 +0100 @@ -143,7 +143,7 @@ def list_commands(self): commands = list_commands(self.COMMAND_HOST) commands = dict(commands) - return sorted(set(commands.itervalues())) + return sorted(commands.values()) class Command(object): diff -r 3c1a1ae44036 -r 21a5444ae76e src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/command_system/implementation/standard.py Sat Jan 05 09:52:09 2013 +0100 @@ -135,7 +135,7 @@ def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'): raise CommandError("Invalid status given") - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue @@ -149,7 +149,7 @@ if not message: message = _("Away") - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue @@ -163,7 +163,7 @@ if not message: message = _("Available") - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue diff -r 3c1a1ae44036 -r 21a5444ae76e src/common/configpaths.py --- a/src/common/configpaths.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/common/configpaths.py Sat Jan 05 09:52:09 2013 +0100 @@ -131,7 +131,7 @@ return default def items(self): - for key in self.paths.iterkeys(): + for key in self.paths.keys(): yield (key, self[key]) def init(self, root=None): diff -r 3c1a1ae44036 -r 21a5444ae76e src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/common/jingle_session.py Sat Jan 05 09:52:09 2013 +0100 @@ -270,8 +270,8 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - return (any((content.is_ready() for content in self.contents.itervalues())) - and self.accepted) + return (any((content.is_ready() for content in self.contents.values())) + and self.accepted) def accept_session(self): """ @@ -589,7 +589,7 @@ """ Broadcast the stanza to all content handlers """ - for content in self.contents.itervalues(): + for content in self.contents.values(): content.on_stanza(stanza, None, error, action) def __parse_contents(self, jingle): diff -r 3c1a1ae44036 -r 21a5444ae76e src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/filetransfers_window.py Sat Jan 05 09:52:09 2013 +0100 @@ -327,7 +327,7 @@ dialog.set_default_response(Gtk.ResponseType.OK) desc_hbox = Gtk.HBox(False, 5) - desc_hbox.pack_start(Gtk.Label(_('Description: ', True, True, 0)), False, False, 0) + desc_hbox.pack_start(Gtk.Label(_('Description: ')), False, False, 0) desc_hbox.pack_start(win, True, True, 0) dialog.vbox.pack_start(desc_hbox, False, False, 0) diff -r 3c1a1ae44036 -r 21a5444ae76e src/network_manager_listener.py --- a/src/network_manager_listener.py Sat Jan 05 00:03:36 2013 +0100 +++ b/src/network_manager_listener.py Sat Jan 05 09:52:09 2013 +0100 @@ -29,7 +29,7 @@ """ For Network Manager 0.6 """ - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: connection._reconnect() @@ -38,7 +38,7 @@ """ For Network Manager 0.6 """ - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB() @@ -49,12 +49,12 @@ """ nm_state = props.Get("org.freedesktop.NetworkManager", "State") if nm_state == 3 or nm_state == 70: - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: connection._reconnect() else: - for connection in gajim.connections.itervalues(): + for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: connection._disconnectedReconnCB()

1 0

python-nbxmpp: dict.items() -> list(dict.items())
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 928fa60a9d79 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=928fa60a9d79 description: dict.items() -> list(dict.items()) diffstat: nbxmpp/idlequeue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5a67220715df -r 928fa60a9d79 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sat Jan 05 10:17:25 2013 +0100 +++ b/nbxmpp/idlequeue.py Sat Jan 05 10:17:56 2013 +0100 @@ -307,7 +307,7 @@ """ current_time = self.current_time() - for fd, timeouts in self.read_timeouts.items(): + for fd, timeouts in list(self.read_timeouts.items()): if fd not in self.queue: self.remove_timeout(fd) continue

1 0

python-nbxmpp: fix encoding issues
by Yann Leboulanger 05 Jan '13

05 Jan '13

changeset 5a67220715df in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5a67220715df description: fix encoding issues diffstat: nbxmpp/transports_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r b3824e6bda79 -r 5a67220715df nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Wed Jan 02 22:50:52 2013 +0100 +++ b/nbxmpp/transports_nb.py Sat Jan 05 10:17:25 2013 +0100 @@ -546,7 +546,7 @@ self._plug_idle( writable=((self.sendqueue!=[]) or (self.sendbuff!='')), readable=True) - self.raise_event(DATA_SENT, sent_data) + self.raise_event(DATA_SENT, sent_data.decode('utf-8')) except Exception: log.error('_do_send:', exc_info=True) @@ -601,7 +601,7 @@ self.renew_send_timeout2() # pass received data to owner if self.on_receive: - self.raise_event(DATA_RECEIVED, received) + self.raise_event(DATA_RECEIVED, received.decode('utf-8')) self._on_receive(received) else: # This should never happen, so we need the debug.

1 0

gajim: fix traceback handling
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset 3c1a1ae44036 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c1a1ae44036 description: fix traceback handling fix struc and sha1 usage (use bytes instead of string) diffstat: plugins/dbus_plugin/plugin.py | 2 +- src/common/connection_handlers_events.py | 2 +- src/common/contacts.py | 2 +- src/common/ged.py | 4 +- src/common/helpers.py | 7 +- src/common/idle.py | 2 +- src/common/jingle_ft.py | 4 +- src/common/jingle_rtp.py | 4 +- src/common/logger.py | 16 +++--- src/common/optparser.py | 2 +- src/common/proxy65_manager.py | 8 +- src/common/socks5.py | 74 +++++++++++++++++-------------- src/common/zeroconf/client_zeroconf.py | 12 ++-- src/common/zeroconf/zeroconf_avahi.py | 2 +- src/common/zeroconf/zeroconf_bonjour.py | 4 +- src/config.py | 4 +- src/dialogs.py | 2 +- src/gajim.py | 2 +- src/gtkgui_helpers.py | 4 +- src/htmltextview.py | 2 +- src/plugins/pluginmanager.py | 22 ++++---- src/plugins/plugins_i18n.py | 2 +- src/remote_control.py | 2 +- test/unit/test_socks5.py | 23 ++++----- 24 files changed, 107 insertions(+), 101 deletions(-) diffs (truncated from 756 to 300 lines): diff -r a04906b5d788 -r 3c1a1ae44036 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Fri Jan 04 23:11:07 2013 +0100 +++ b/plugins/dbus_plugin/plugin.py Sat Jan 05 00:03:36 2013 +0100 @@ -508,7 +508,7 @@ def prefs_store(self): try: gajim.interface.save_config() - except Exception as e: + except Exception: return DBUS_BOOLEAN(False) return DBUS_BOOLEAN(True) diff -r a04906b5d788 -r 3c1a1ae44036 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/connection_handlers_events.py Sat Jan 05 00:03:36 2013 +0100 @@ -218,7 +218,7 @@ try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - except ValueError as e: + except ValueError: try: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S.%fZ') diff -r a04906b5d788 -r 3c1a1ae44036 src/common/contacts.py --- a/src/common/contacts.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/contacts.py Sat Jan 05 00:03:36 2013 +0100 @@ -36,7 +36,7 @@ import common.gajim except ImportError as e: if __name__ != "__main__": - raise ImportError(e) + raise ImportError(str(e)) class XMPPEntity(object): """ diff -r a04906b5d788 -r 3c1a1ae44036 src/common/ged.py --- a/src/common/ged.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/ged.py Sat Jan 05 00:03:36 2013 +0100 @@ -79,7 +79,7 @@ if event_name in self.handlers: try: self.handlers[event_name].remove((priority, handler)) - except ValueError as error: + except ValueError: 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 as e: + except Exception: log.error('Error while running an even handler: %s' % \ handler) traceback.print_exc() diff -r a04906b5d788 -r 3c1a1ae44036 src/common/helpers.py --- a/src/common/helpers.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/helpers.py Sat Jan 05 00:03:36 2013 +0100 @@ -915,7 +915,8 @@ """ Return sha of sid + initiator + target used for proxy auth """ - return hashlib.sha1("%s%s%s" % (sid, initiator, target)).hexdigest() + return hashlib.sha1(("%s%s%s" % (sid, initiator, target)).encode('utf-8')).\ + hexdigest() def remove_invalid_xml_chars(string): if string: @@ -1545,9 +1546,9 @@ alt = attrs.get('alt', '') if alt: alt += '\n' - if ex[0] == pycurl.E_FILESIZE_EXCEEDED: + if ex.errno == pycurl.E_FILESIZE_EXCEEDED: alt += _('Image is too big') - elif ex[0] == pycurl.E_OPERATION_TIMEOUTED: + elif ex.errno == pycurl.E_OPERATION_TIMEOUTED: alt += _('Timeout loading image') else: alt += _('Error loading image') diff -r a04906b5d788 -r 3c1a1ae44036 src/common/idle.py --- a/src/common/idle.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/idle.py Sat Jan 05 00:03:36 2013 +0100 @@ -68,7 +68,7 @@ rootwindow = libX11.XDefaultRootWindow(dpy_p) xss_available = True -except OSError as e: +except OSError: # Logging? xss_available = False diff -r a04906b5d788 -r 3c1a1ae44036 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/jingle_ft.py Sat Jan 05 00:03:36 2013 +0100 @@ -95,8 +95,8 @@ if gajim.contacts.is_gc_contact(session.connection.name, session.peerjid): roomjid = session.peerjid.split('/')[0] - dstaddr = hashlib.sha1('%s%s%s' % (self.file_props['sid'], - session.ourjid, roomjid)).hexdigest() + dstaddr = hashlib.sha1(('%s%s%s' % (self.file_props['sid'], + session.ourjid, roomjid)).encode('utf-8')).hexdigest() self.file_props.dstaddr = dstaddr self.state = STATE_NOT_STARTED self.states = {STATE_INITIALIZED : StateInitialized(self), diff -r a04906b5d788 -r 3c1a1ae44036 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/jingle_rtp.py Sat Jan 05 00:03:36 2013 +0100 @@ -105,13 +105,13 @@ try: bin = gst.parse_bin_from_description(pipeline, True) return bin - except GError as error_str: + except GError as e: gajim.nec.push_incoming_event(InformationEvent(None, conn=self.session.connection, level='error', pri_txt=_('%s configuration error') % text.capitalize(), sec_txt=_("Couldn't setup %s. Check your configuration.\n\n" "Pipeline was:\n%s\n\nError was:\n%s") % (text, pipeline, - error_str))) + str(e)))) raise JingleContentSetupException def add_remote_candidates(self, candidates): diff -r a04906b5d788 -r 3c1a1ae44036 src/common/logger.py --- a/src/common/logger.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/logger.py Sat Jan 05 00:03:36 2013 +0100 @@ -256,7 +256,7 @@ self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ)) self.con.commit() - except sqlite.IntegrityError as e: + except sqlite.IntegrityError: # Jid already in DB, maybe added by another instance. re-read DB self.get_jids_already_in_db() return self.get_jid_id(jid, typestr) @@ -580,7 +580,7 @@ """ try: self.get_jid_id(jid) - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return [] where_sql, jid_tuple = self._build_contact_where(account, jid) @@ -624,7 +624,7 @@ """ try: self.get_jid_id(jid) - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return [] where_sql, jid_tuple = self._build_contact_where(account, jid) @@ -653,7 +653,7 @@ """ try: self.get_jid_id(jid) - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return [] @@ -694,7 +694,7 @@ """ try: self.get_jid_id(jid) - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return [] days_with_logs = [] @@ -736,7 +736,7 @@ else: try: jid_id = self.get_jid_id(jid, 'ROOM') - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return None where_sql = 'jid_id = ?' @@ -762,7 +762,7 @@ """ try: jid_id = self.get_jid_id(jid, 'ROOM') - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: # Error trying to create a new jid_id. This means there is no log return None where_sql = 'jid_id = %s' % jid_id @@ -802,7 +802,7 @@ for user in family: try: jid_id = self.get_jid_id(user['jid']) - except exceptions.PysqliteOperationalError as e: + except exceptions.PysqliteOperationalError: continue where_sql += 'jid_id = ?' jid_tuple += (jid_id,) diff -r a04906b5d788 -r 3c1a1ae44036 src/common/optparser.py --- a/src/common/optparser.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/optparser.py Sat Jan 05 00:03:36 2013 +0100 @@ -644,7 +644,7 @@ ''' ) con.commit() - except sqlite.OperationalError as e: + except sqlite.OperationalError: pass con.close() gajim.config.set('version', '0.11.4.4') diff -r a04906b5d788 -r 3c1a1ae44036 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/proxy65_manager.py Sat Jan 05 00:03:36 2013 +0100 @@ -310,7 +310,7 @@ # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2]) + version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) if version != 0x05 or method == 0xff: self.pollend() return @@ -334,7 +334,7 @@ self._send = self._sock.send self._recv = self._sock.recv except Exception as ee: - errnum = ee[0] + errnum = ee.errno # 56 is for freebsd if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # still trying to connect @@ -431,7 +431,7 @@ # read auth response if buff is None or len(buff) != 2: return None - version, method = struct.unpack('!BB', buff[:2]) + version, method = struct.unpack('!BB', buff[:2].encode('utf-8')) if version != 0x05 or method == 0xff: self.pollend() return @@ -443,7 +443,7 @@ # read connect response if buff is None or len(buff) < 2: return None - version, reply = struct.unpack('!BB', buff[:2]) + version, reply = struct.unpack('!BB', buff[:2].encode('utf-8')) if version != 0x05 or reply != 0x00: self.pollend() return diff -r a04906b5d788 -r 3c1a1ae44036 src/common/socks5.py --- a/src/common/socks5.py Fri Jan 04 23:11:07 2013 +0100 +++ b/src/common/socks5.py Sat Jan 05 00:03:36 2013 +0100 @@ -464,7 +464,7 @@ self._server = ai[4] break except socket.error as e: - if not isinstance(e, basestring) and e[0] == EINPROGRESS: + if e.errno == EINPROGRESS: break # for all other errors, we try other addresses continue @@ -482,7 +482,7 @@ self._send=self._sock.send self._recv=self._sock.recv except Exception as ee: - errnum = ee[0] + errnum = ee.errno self.connect_timeout += 1 if errnum == 111 or self.connect_timeout > 1000: self.queue._connection_refused(self.streamhost, self.file_props, @@ -581,7 +581,7 @@ """ received = '' try: - add = self._recv(64) + add = self._recv(64).decode('utf-8') except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request : ' + repr(e)) @@ -603,7 +603,7 @@ OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request :' + repr(e)) raise e - except Exception as e: + except Exception: self.disconnect() return len(raw_data) @@ -614,7 +614,7 @@ else: try: self.open_file_for_reading() - except IOError as e: + except IOError: self.state = 8 # end connection self.disconnect()

1 0

gajim: fix registering an account
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset a04906b5d788 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a04906b5d788 description: fix registering an account diffstat: data/gui/account_creation_wizard_window.ui | 25 +++++++++++++------------ src/common/connection.py | 4 ++-- src/common/connection_handlers_events.py | 11 ++++++----- src/dataforms_widget.py | 3 ++- 4 files changed, 23 insertions(+), 20 deletions(-) diffs (145 lines): diff -r 2f524e1f9bb8 -r a04906b5d788 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Fri Jan 04 22:31:30 2013 +0100 +++ b/data/gui/account_creation_wizard_window.ui Fri Jan 04 23:11:07 2013 +0100 @@ -12,6 +12,12 @@ </row> </data> </object> + <object class="GtkListStore" id="server_liststore"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkEntryCompletion" id="server_entrycompletion"> <property name="model">server_liststore</property> <property name="text_column">0</property> @@ -36,6 +42,7 @@ <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="show_tabs">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> @@ -276,7 +283,7 @@ <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> </object> @@ -404,7 +411,7 @@ <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -484,7 +491,7 @@ <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled" swapped="no"/> </object> @@ -649,7 +656,7 @@ <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_action_appearance">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -793,7 +800,7 @@ <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -812,7 +819,7 @@ <property name="receives_default">False</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -1028,10 +1035,4 @@ </object> </child> </object> - <object class="GtkListStore" id="server_liststore"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> </interface> diff -r 2f524e1f9bb8 -r a04906b5d788 src/common/connection.py --- a/src/common/connection.py Fri Jan 04 22:31:30 2013 +0100 +++ b/src/common/connection.py Fri Jan 04 23:11:07 2013 +0100 @@ -913,8 +913,8 @@ self.connection.SendAndCallForResponse(iq, _on_register_result) else: - if self.new_account_form.keys().sort() != \ - conf.keys().sort(): + if list(self.new_account_form.keys()).sort() != \ + list(conf.keys()).sort(): # requested config has changed since first connection reason = _('Server %s provided a different ' 'registration form') % data[0] diff -r 2f524e1f9bb8 -r a04906b5d788 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Jan 04 22:31:30 2013 +0100 +++ b/src/common/connection_handlers_events.py Fri Jan 04 23:11:07 2013 +0100 @@ -1560,12 +1560,13 @@ try: self.errnum = self.conn.connection.Connection.ssl_errnum except AttributeError: - self.errnum = -1 # we don't have an errnum + self.errnum = [] # we don't have an errnum self.ssl_msg = '' - if self.errnum > 0: - from common.connection import ssl_error - self.ssl_msg = ssl_error.get(self.errnum, _( - 'Unknown SSL error: %d') % self.errnum) + for er in self.errnum: + if er > 0: + from common.connection import ssl_error + self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ + er) self.ssl_cert = '' if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem diff -r 2f524e1f9bb8 -r a04906b5d788 src/dataforms_widget.py --- a/src/dataforms_widget.py Fri Jan 04 22:31:30 2013 +0100 +++ b/src/dataforms_widget.py Fri Jan 04 23:11:07 2013 +0100 @@ -26,6 +26,7 @@ multiple - these which may contain more data (with <reported/> element).''' from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject import base64 @@ -566,7 +567,7 @@ 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) pixbuf_l = GdkPixbuf.PixbufLoader() pixbuf_l.write(img_data) pixbuf_l.close()

1 0

gajim: fix speller
by Yann Leboulanger 04 Jan '13

04 Jan '13

changeset 2f524e1f9bb8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2f524e1f9bb8 description: fix speller diffstat: src/gtkspell.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 2a2cc0bd56db -r 2f524e1f9bb8 src/gtkspell.py --- a/src/gtkspell.py Sat Jan 05 01:27:22 2013 +0400 +++ b/src/gtkspell.py Fri Jan 04 22:31:30 2013 +0100 @@ -70,7 +70,8 @@ if create: if spell: raise RuntimeError("Textview has already a Spell obj attached") - self.spell = libgtkspell.gtkspell_new_attach(tv, language, None) + self.spell = libgtkspell.gtkspell_new_attach(tv, language.encode( + 'utf-8'), None) if not self.spell: raise OSError("Unable to attach spell object. " "Language: '%s'" % str(language)) @@ -82,7 +83,8 @@ @ensure_attached def set_language(self, language): - if libgtkspell.gtkspell_set_language(self.spell, language, None) == 0: + if libgtkspell.gtkspell_set_language(self.spell, language.encode( + 'utf-8'), None) == 0: raise OSError("Unable to set language '%s'" % str(language)) @ensure_attached

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