Commits September 2015

commits@gajim.org

1 participants
27 discussions

python-nbxmpp: correctly compute message length (number of bytes...
by Python-nbxmpp 13 Sep '15

13 Sep '15

changeset 60c341b966b1 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=60c341b966b1 description: correctly compute message length (number of bytes instead of number of char). Fixes #35 diffstat: nbxmpp/transports_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r a235715022e5 -r 60c341b966b1 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Tue Sep 01 20:38:24 2015 +0100 +++ b/nbxmpp/transports_nb.py Sun Sep 13 15:14:31 2015 +0200 @@ -752,11 +752,11 @@ if 'Connection' in headers and headers['Connection'].strip()=='close': self.close_current_connection = True - if self.expected_length > len(httpbody): + if self.expected_length > len(httpbody.encode('utf-8')): # If we haven't received the whole HTTP mess yet, let's end the thread. # It will be finnished from one of following recvs on plugged socket. log.info('not enough bytes in HTTP response - %d expected, got %d' % - (self.expected_length, len(httpbody))) + (self.expected_length, len(httpbody.encode('utf-8')))) else: # First part of buffer has been extraced and is going to be handled, # remove it from buffer

1 0

gajim: update XEP-0334 (Message Processing Hints) to V0.2
by Gajim 13 Sep '15

13 Sep '15

changeset cddaf9175a96 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=cddaf9175a96 description: update XEP-0334 (Message Processing Hints) to V0.2 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 6d190a988b10 -r cddaf9175a96 src/common/connection.py --- a/src/common/connection.py Thu Sep 03 22:06:04 2015 +0200 +++ b/src/common/connection.py Sun Sep 13 13:57:04 2015 +0200 @@ -425,7 +425,7 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) if form_node: @@ -505,7 +505,7 @@ if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) msg_iq.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS)

1 0

gajim: don't fail when we receive a MAM message without a body. ...
by Gajim 03 Sep '15

03 Sep '15

changeset 6d190a988b10 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6d190a988b10 description: don't fail when we receive a MAM message without a body. Fixes #8140 diffstat: src/common/logger.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (40 lines): diff -r 8bac9f87935e -r 6d190a988b10 src/common/logger.py --- a/src/common/logger.py Mon Aug 31 13:47:18 2015 +0200 +++ b/src/common/logger.py Thu Sep 03 22:06:04 2015 +0200 @@ -1103,21 +1103,22 @@ time_col = int(float(time.mktime(tim))) else: time_col = int(float(time.time())) - if msg: - if self.jid_is_from_pm(with_) or nick: - # It's a groupchat message - if nick: - # It's a message from a groupchat occupent - type_ = 'gc_msg' - with_ = with_ + '/' + nick - else: - # It's a server message message, we don't log them - return + if not msg: + return + if self.jid_is_from_pm(with_) or nick: + # It's a groupchat message + if nick: + # It's a message from a groupchat occupent + type_ = 'gc_msg' + with_ = with_ + '/' + nick else: - if direction == 'from': - type_ = 'chat_msg_recv' - elif direction == 'to': - type_ = 'chat_msg_sent' + # It's a server message message, we don't log them + return + else: + if direction == 'from': + type_ = 'chat_msg_recv' + elif direction == 'to': + type_ = 'chat_msg_sent' jid_id = self.get_jid_id(with_) where_sql = 'jid_id = %s AND message=?' % jid_id if type_ == 'gc_msg':

1 0

gajim-plugins: Fixed bug on first install, version 0.2.9
by Gajim Plugins 02 Sep '15

02 Sep '15

changeset 880aab3698b1 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=880aab3698b1 description: Fixed bug on first install, version 0.2.9 diffstat: httpupload/httpupload.py | 25 +++++++++++++++---------- httpupload/manifest.ini | 2 +- 2 Dateien ver?ndert, 16 Zeilen hinzugef?gt(+), 11 Zeilen entfernt(-) Unterschiede (110 Zeilen): diff -r 16ec6abb2297 -r 880aab3698b1 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Sep 03 01:24:23 2015 +0200 +++ b/httpupload/httpupload.py Thu Sep 03 01:47:28 2015 +0200 @@ -124,19 +124,21 @@ self.button = gtk.Button(label=None, stock=None, use_underline=True) self.button.set_property('relief', gtk.RELIEF_NONE) self.button.set_property('can-focus', False) - self.image_button = gtk.Button(label=None, stock=None, use_underline=True) - self.image_button.set_property('relief', gtk.RELIEF_NONE) - self.image_button.set_property('can-focus', False) + self.button.set_sensitive(False) img = gtk.Image() img.set_from_file(os.path.join(gajim.gajimpaths.data_root, u'plugins', u'httpupload', u'httpupload.png')) self.button.set_image(img) - self.button.set_tooltip_text('Send file via http upload') + self.button.set_tooltip_text(_('Your server does not support http uploads')) + self.image_button = gtk.Button(label=None, stock=None, use_underline=True) + self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.image_button.set_property('can-focus', False) + self.image_button.set_sensitive(False) img = gtk.Image() img.set_from_file(os.path.join(gajim.gajimpaths.data_root, u'plugins', u'httpupload', u'image.png')) self.image_button.set_image(img) - self.image_button.set_tooltip_text('Send file via http upload') + self.image_button.set_tooltip_text(_('Your server does not support http uploads')) send_button = chat_control.xml.get_object('send_button') send_button_pos = actions_hbox.child_get_property(send_button, 'position') @@ -228,6 +230,7 @@ slot = stanza.getTag("slot") if not slot: + progress_window.close_dialog() log.error("got unexpected stanza: "+str(stanza)) error = stanza.getTag("error") if error and error.getTag("text"): @@ -238,16 +241,15 @@ ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) - progress_window.close_dialog() return put = slot.getTag("put") get = slot.getTag("get") if not put or not get: + progress_window.close_dialog() log.error("got unexpected stanza: " + str(stanza)) ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) - progress_window.close_dialog() return def upload_complete(response_code): @@ -285,6 +287,7 @@ self.chat_control.send_message(message=get.getData(), xhtml=xhtml) self.chat_control.msg_textview.grab_focus() else: + progress_window.close_dialog() log.error("got unexpected http upload response code: " + str(response_code)) ErrorDialog(_('Could not upload file'), _('Got unexpected http response code from server: ') + str(response_code), @@ -304,20 +307,22 @@ except UploadAbortedException: log.info("Upload aborted") except: + progress_window.close_dialog() ErrorDialog(_('Could not upload file'), _('Got unexpected exception while uploading file (see error log for more information)'), transient_for=self.chat_control.parent_win.window) raise # fill error log with useful information return 0 - log.info("Uploading to: " + str(put.getData())) - log.info("Please download from: " + str(get.getData()) + "later") + log.info("Uploading file to " + str(put.getData())) + log.info("Please download from " + str(get.getData()) + " later") gajim.thread_interface(uploader, [], upload_complete) is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ gajim.connections[self.chat_control.account].connection != None if not is_supported: + progress_window.close_dialog() log.error("upload component vanished, account got disconnected??") ErrorDialog(_('Your server does not support http uploads or you just got disconnected'), transient_for=self.chat_control.parent_win.window) @@ -349,7 +354,7 @@ content_type.addData(mime_type) # send slot request and register callback - log.debug("sending slot request iq...") + log.debug("sending httpupload slot request iq...") iq_ids_to_callbacks[str(id_)] = upload_file gajim.connections[self.chat_control.account].connection.send(iq) diff -r 16ec6abb2297 -r 880aab3698b1 httpupload/manifest.ini --- a/httpupload/manifest.ini Thu Sep 03 01:24:23 2015 +0200 +++ b/httpupload/manifest.ini Thu Sep 03 01:47:28 2015 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.2.8 +version: 0.2.9 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim-plugins: Added missing homepage field to manifest.ini
by Gajim Plugins 02 Sep '15

02 Sep '15

changeset 16ec6abb2297 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=16ec6abb2297 description: Added missing homepage field to manifest.ini diffstat: httpupload/.httpupload.py.kate-swp | Bin httpupload/manifest.ini | 4 +++- 2 Dateien ver?ndert, 3 Zeilen hinzugef?gt(+), 1 Zeilen entfernt(-) Unterschiede (19 Zeilen): diff -r 59a52d1e3ca0 -r 16ec6abb2297 httpupload/.httpupload.py.kate-swp Binary file httpupload/.httpupload.py.kate-swp has changed diff -r 59a52d1e3ca0 -r 16ec6abb2297 httpupload/manifest.ini --- a/httpupload/manifest.ini Wed Sep 02 01:53:28 2015 +0200 +++ b/httpupload/manifest.ini Thu Sep 03 01:24:23 2015 +0200 @@ -1,5 +1,5 @@ [info] -name: Httpupload +name: HttpUpload short_name: httpupload version: 0.2.8 description: This plugin is designed to send a file to a contact or muc by using httpupload. @@ -8,4 +8,6 @@ If the receiving side supports <a href="http://xmpp.org/extensions/xep-0071.html">XEP-0071: XHTML-IM</a> and maintains the scheme data: URI, a thumbnail image is send along the link to the full size image. authors: Thilo Molitor <thilo(a)eightysoft.de> +homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin +min_gajim_version: 0.16.0 max_gajim_version: 0.16.9

1 0

gajim-plugins: Initial commit of httpupload plugin (version 0.2.8)
by Gajim Plugins 01 Sep '15

01 Sep '15

changeset 59a52d1e3ca0 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=59a52d1e3ca0 description: Initial commit of httpupload plugin (version 0.2.8) diffstat: httpupload/.httpupload.py.kate-swp | Bin httpupload/__init__.py | 1 + httpupload/httpupload.png | Bin httpupload/httpupload.py | 454 +++++++++++++++++++++++++++++++++++ httpupload/image.png | Bin httpupload/manifest.ini | 11 + httpupload/upload_progress_dialog.ui | 105 ++++++++ 7 Dateien ver?ndert, 571 Zeilen hinzugef?gt(+), 0 Zeilen entfernt(-) Unterschiede (gek?rzt von 593 auf 300 Zeilen): diff -r de8e9bc4f357 -r 59a52d1e3ca0 httpupload/.httpupload.py.kate-swp Binary file httpupload/.httpupload.py.kate-swp has changed diff -r de8e9bc4f357 -r 59a52d1e3ca0 httpupload/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/__init__.py Wed Sep 02 01:53:28 2015 +0200 @@ -0,0 +1,1 @@ +from httpupload import HttpuploadPlugin diff -r de8e9bc4f357 -r 59a52d1e3ca0 httpupload/httpupload.png Binary file httpupload/httpupload.png has changed diff -r de8e9bc4f357 -r 59a52d1e3ca0 httpupload/httpupload.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/httpupload.py Wed Sep 02 01:53:28 2015 +0200 @@ -0,0 +1,454 @@ +# -*- coding: utf-8 -*- +## + +from common import demandimport +demandimport.enable() +demandimport.ignore += ['builtins', '__builtin__'] + +import gtk +import gobject +import os +import base64 +import urllib2 +import mimetypes # better use the magic packet, but that's not a standard lib +import gtkgui_helpers +from Queue import Queue +try: + from PIL import Image +except: + pass +import StringIO +import base64 + +from common import gajim +from common import ged +import chat_control +from plugins import GajimPlugin +from plugins.helpers import log_calls, log +from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog +import nbxmpp + +NS_HTTPUPLOAD = 'eu:siacs:conversations:http:upload' # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) + +jid_to_servers = {} +iq_ids_to_callbacks = {} +max_thumbnail_size = 2048 +max_thumbnail_dimension = 160 + +class HttpuploadPlugin(GajimPlugin): + @log_calls('HttpuploadPlugin') + def init(self): + self.config_dialog = None # HttpuploadPluginConfigDialog(self) + self.controls = [] + self.events_handlers = {} + self.events_handlers['agent-info-received'] = (ged.PRECORE, + self.handle_agent_info_received) + self.events_handlers['raw-iq-received'] = (ged.PRECORE, + self.handle_iq_received) + self.gui_extension_points = { + 'chat_control_base': (self.connect_with_chat_control, + self.disconnect_from_chat_control), + 'chat_control_base_update_toolbar': (self.update_button_state, + None)} + self.first_run = True + + def handle_iq_received(self, event): + global iq_ids_to_callbacks + id_ = event.stanza.getAttr("id") + if str(id_) in iq_ids_to_callbacks: + try: + iq_ids_to_callbacks[str(id_)](event.stanza) + except: + raise + finally: + del iq_ids_to_callbacks[str(id_)] + + def handle_agent_info_received(self, event): + global jid_to_servers + if NS_HTTPUPLOAD in event.features and gajim.jid_is_transport(event.jid): + own_jid = gajim.get_jid_without_resource(str(event.stanza.getTo())) + jid_to_servers[own_jid] = event.jid # map own jid to upload component's jid + log.info(own_jid + " can do http uploads via component " + event.jid) + # update all buttons + for base in self.controls: + self.update_button_state(base.chat_control) + + @log_calls('HttpuploadPlugin') + def connect_with_chat_control(self, control): + self.chat_control = control + base = Base(self, self.chat_control) + self.controls.append(base) + if self.first_run: + # ALT + U + gtk.binding_entry_add_signal(control.msg_textview, + gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', + int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) + self.first_run = False + + @log_calls('HttpuploadPlugin') + def disconnect_from_chat_control(self, chat_control): + for control in self.controls: + control.disconnect_from_chat_control() + self.controls = [] + + @log_calls('HttpuploadPlugin') + def update_button_state(self, chat_control): + for base in self.controls: + if base.chat_control == chat_control: + if gajim.connections[chat_control.account].connection == None and \ + gajim.get_jid_from_account(chat_control.account) in jid_to_servers: + del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] + is_supported = gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.connections[chat_control.account].connection != None + if not is_supported: + text = _('Your server does not support http uploads') + image_text = text + else: + text = _('Send file via http upload') + image_text = _('Send image via http upload') + base.button.set_sensitive(is_supported) + base.button.set_tooltip_text(text) + base.image_button.set_sensitive(is_supported) + base.image_button.set_tooltip_text(image_text) + + +class Base(object): + def __init__(self, plugin, chat_control): + self.dlg = None + self.dialog_type = 'file' + self.keypress_id = chat_control.msg_textview.connect('mykeypress', + self.on_key_press) + self.plugin = plugin + self.chat_control = chat_control + actions_hbox = chat_control.xml.get_object('actions_hbox') + self.button = gtk.Button(label=None, stock=None, use_underline=True) + self.button.set_property('relief', gtk.RELIEF_NONE) + self.button.set_property('can-focus', False) + self.image_button = gtk.Button(label=None, stock=None, use_underline=True) + self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.image_button.set_property('can-focus', False) + img = gtk.Image() + img.set_from_file(os.path.join(gajim.gajimpaths.data_root, + u'plugins', u'httpupload', u'httpupload.png')) + self.button.set_image(img) + self.button.set_tooltip_text('Send file via http upload') + img = gtk.Image() + img.set_from_file(os.path.join(gajim.gajimpaths.data_root, + u'plugins', u'httpupload', u'image.png')) + self.image_button.set_image(img) + self.image_button.set_tooltip_text('Send file via http upload') + send_button = chat_control.xml.get_object('send_button') + send_button_pos = actions_hbox.child_get_property(send_button, + 'position') + actions_hbox.add_with_properties(self.button, 'position', + send_button_pos - 2, 'expand', False) + + actions_hbox.add_with_properties(self.image_button, 'position', + send_button_pos - 1, 'expand', False) + + file_id = self.button.connect('clicked', self.on_file_button_clicked) + image_id = self.image_button.connect('clicked', self.on_image_button_clicked) + chat_control.handlers[file_id] = self.button + chat_control.handlers[image_id] = self.image_button + chat_control.handlers[self.keypress_id] = chat_control.msg_textview + self.button.show() + self.image_button.show() + + def on_key_press(self, widget, event_keyval, event_keymod): + # construct event instance from binding + event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here + event.keyval = event_keyval + event.state = event_keymod + event.time = 0 # assign current time + + if event.keyval != gtk.keysyms.u: + return + if event.state != gtk.gdk.MOD1_MASK: # ALT+u + return + is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ + gajim.connections[self.chat_control.account].connection != None + if not is_supported: + from dialogs import WarningDialog + WarningDialog('Warning', _('Your server does not support http uploads'), + transient_for=self.chat_control.parent_win.window) + return + self.on_file_button_clicked(widget) + + def disconnect_from_chat_control(self): + actions_hbox = self.chat_control.xml.get_object('actions_hbox') + actions_hbox.remove(self.button) + actions_hbox.remove(self.image_button) + if self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): + self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) + del self.chat_control.handlers[self.keypress_id] + + def on_file_dialog_ok(self, widget, path_to_file=None): + global jid_to_servers + if not path_to_file: + path_to_file = self.dlg.get_filename() + if not path_to_file: + self.dlg.destroy() + return + path_to_file = gtkgui_helpers.decode_filechooser_file_paths( + (path_to_file,))[0] + self.dlg.destroy() + if not os.path.exists(path_to_file): + return + filesize = os.path.getsize(path_to_file) # in bytes + invalid_file = False + msg = '' + if os.path.isfile(path_to_file): + stat = os.stat(path_to_file) + if stat[6] == 0: + invalid_file = True + msg = _('File is empty') + else: + invalid_file = True + msg = _('File does not exist') + if invalid_file: + ErrorDialog(_('Could not open file'), msg, transient_for=self.chat_control.parent_win.window) + return + + mime_type = mimetypes.MimeTypes().guess_type(path_to_file)[0] + if not mime_type: + mime_type = 'application/octet-stream' # fallback mime type + log.info("Detected MIME Type of file: " + str(mime_type)) + progress_messages = Queue(8) + progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages) + def upload_file(stanza): + try: + open(path_to_file, "rb").read(1) # check for open/read errors (maybe this is not needed anymore) + data = StreamFileWithProgress(path_to_file, "rb", progress_window.update_progress) + except: + progress_window.close_dialog() + ErrorDialog(_('Could not open file'), + _('Exception raised while opening file (see error log for more information)'), + transient_for=self.chat_control.parent_win.window) + raise # fill error log with useful information + + slot = stanza.getTag("slot") + if not slot: + log.error("got unexpected stanza: "+str(stanza)) + error = stanza.getTag("error") + if error and error.getTag("text"): + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server: ') + str(error.getTagData("text")), + transient_for=self.chat_control.parent_win.window) + else: + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server (protocol mismatch??)'), + transient_for=self.chat_control.parent_win.window) + progress_window.close_dialog() + return + put = slot.getTag("put") + get = slot.getTag("get") + if not put or not get: + log.error("got unexpected stanza: " + str(stanza)) + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server (protocol mismatch??)'), + transient_for=self.chat_control.parent_win.window) + progress_window.close_dialog() + return + + def upload_complete(response_code): + if response_code == 0: + return # Upload was aborted + if response_code >= 200 and response_code < 300: + log.info("Upload completed successfully") + xhtml = None + is_image = mime_type.split('/', 1)[0] == 'image' + if (not isinstance(self.chat_control, chat_control.ChatControl) or not self.chat_control.gpg_is_active) and \ + self.dialog_type == 'image' and is_image: + progress_messages.put(_('Calculating (possible) image thumbnail...')) + try: + quality_steps = (100, 80, 60, 50, 40, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) + for quality in quality_steps: + thumb = Image.open(path_to_file) + thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) + output = StringIO.StringIO() + thumb.save(output, format='JPEG', quality=quality, optimize=True) + thumb = output.getvalue() + output.close() + thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) + if len(thumb) < max_thumbnail_size: + break + if len(thumb) > max_thumbnail_size: + log.info("Couldn't compress image enough, not sending any thumbnail") + else: + log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) + xhtml = '<body> <a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ + (get.getData(), get.getData(), thumb) + except: + pass + progress_window.close_dialog() + self.chat_control.send_message(message=get.getData(), xhtml=xhtml) + self.chat_control.msg_textview.grab_focus() + else:

1 0

python-nbxmpp: Fix tests for py3k
by Python-nbxmpp 01 Sep '15

01 Sep '15

changeset a235715022e5 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a235715022e5 description: Fix tests for py3k diffstat: nbxmpp/idlequeue.py | 4 ++-- nbxmpp/transports_nb.py | 2 +- test/lib/mock.py | 2 +- test/runtests.py | 11 ++++++----- test/unit/test_xmpp_transports_nb2.py | 5 +++-- 5 files changed, 13 insertions(+), 11 deletions(-) diffs (103 lines): diff -r 1affd30d986f -r a235715022e5 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sun Aug 16 21:34:37 2015 +0200 +++ b/nbxmpp/idlequeue.py Tue Sep 01 20:38:24 2015 +0100 @@ -42,7 +42,7 @@ elif os.name == 'posix': import fcntl -if sys.version_info[0] == 2: +if sys.version_info[0] == 2 or not HAVE_GLIB: FLAG_WRITE = 20 # write only FLAG_READ = 19 # read only FLAG_READ_WRITE = 23 # read and write @@ -568,7 +568,7 @@ def process(self): self._check_time_events() - if sys.version_info[0] == 2: + if sys.version_info[0] == 2 or not HAVE_GLIB: def current_time(self): return gobject.get_current_time() * 1e6 else: diff -r 1affd30d986f -r a235715022e5 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Aug 16 21:34:37 2015 +0200 +++ b/nbxmpp/transports_nb.py Tue Sep 01 20:38:24 2015 +0100 @@ -821,7 +821,7 @@ for dummy in header: row = dummy.split(' ', 1) headers[row[0][:-1]] = row[1] - body_size = headers['Content-Length'] + body_size = int(headers['Content-Length']) rest_splitted = splitted[2:] while (len(httpbody) < body_size) and rest_splitted: # Complete httpbody until it has the announced size diff -r 1affd30d986f -r a235715022e5 test/lib/mock.py --- a/test/lib/mock.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/lib/mock.py Tue Sep 01 20:38:24 2015 +0100 @@ -212,7 +212,7 @@ elif isinstance(n, str): return self.kwparams[n] else: - raise IndexError, 'illegal index type for getParam' + raise IndexError('illegal index type for getParam') def getNumParams(self): return len(self.params) diff -r 1affd30d986f -r a235715022e5 test/runtests.py --- a/test/runtests.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/runtests.py Tue Sep 01 20:38:24 2015 +0100 @@ -6,6 +6,7 @@ Unit tests tests will be run on each commit. ''' +from __future__ import print_function import sys import unittest @@ -16,19 +17,19 @@ shortargs = 'hv:' longargs = 'help verbose=' opts, args = getopt.getopt(sys.argv[1:], shortargs, longargs.split()) -except getopt.error, msg: - print msg - print 'for help use --help' +except getopt.error as msg: + print(msg) + print('for help use --help') sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print 'runtests [--help] [--verbose level]' + print('runtests [--help] [--verbose level]') sys.exit() elif o in ('-v', '--verbose'): try: verbose = int(a) except Exception: - print 'verbose must be a number >= 0' + print('verbose must be a number >= 0') sys.exit(2) # new test modules need to be added manually diff -r 1affd30d986f -r a235715022e5 test/unit/test_xmpp_transports_nb2.py --- a/test/unit/test_xmpp_transports_nb2.py Sun Aug 16 21:34:37 2015 +0200 +++ b/test/unit/test_xmpp_transports_nb2.py Tue Sep 01 20:38:24 2015 +0100 @@ -72,7 +72,7 @@ ips = socket.getaddrinfo('gajim.org', 5222, socket.AF_UNSPEC, socket.SOCK_STREAM) ip = ips[0] - except socket.error, e: + except socket.error as e: self.testcase.fail(msg=str(e)) self.socket = transports_nb.NonBlockingTCP( @@ -175,7 +175,8 @@ sock._do_send() sock._do_send() self.assertTrue(self.client.socket.state == 'CONNECTED') - self.assertTrue(data_part1 in outgoing and data_part2 in outgoing) + self.assertTrue(data_part1.encode('utf8') in outgoing) + self.assertTrue(data_part2.encode('utf8') in outgoing) self.assertFalse(sock.sendqueue and sock.sendbuff, msg='There is still unsend data in buffers')

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2015