Commits January 2018

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][master] 2 commits: Remove obsolete file
by Philipp Hörist 04 Jan '18

04 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5f0dc56f by André Apitzsch at 2018-01-05T00:24:20+01:00 Remove obsolete file - - - - - 8b2732cf by Philipp Hörist at 2018-01-05T00:31:48+01:00 Merge branch 'nw_watcher' into 'master' Remove obsolete network_watcher See merge request gajim/gajim!182 - - - - - 1 changed file: - − gajim/network_watcher.py Changes: ===================================== gajim/network_watcher.py deleted ===================================== --- a/gajim/network_watcher.py +++ /dev/null @@ -1,101 +0,0 @@ -# -*- coding: utf-8 -*- -## src/network_watcher.py -## -## Copyright (C) 2017 Philipp Hoerist <philipp AT hoerist.com> -## Copyright © 2017 Jörg Sommer <joerg(a)alea.gnuu.de> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - - -import logging - -from gi.repository import Gio, GLib - -from gajim.common import app - -log = logging.getLogger('gajim.network_watcher') - - -supported = False - - -def watch_name(name): - Gio.bus_watch_name( - Gio.BusType.SYSTEM, - name, - Gio.BusNameWatcherFlags.NONE, - appeared, - None) - - -def signal_received(connection, sender_name, object_path, - interface_name, signal_name, parameters, *user_data): - connected = None - log.info('Signal received: %s - %s', interface_name, parameters) - if interface_name == 'org.freedesktop.NetworkManager': - # https://people.freedesktop.org/~lkundrak/nm-docs/nm-dbus-types.html - connected = parameters[0] == 70 - elif interface_name == 'org.freedesktop.DBus.Properties' and len(parameters) >= 2 \ - and parameters[0] == 'org.freedesktop.network1.Manager' \ - and 'OperationalState' in parameters[1]: - connected = parameters[1]['OperationalState'] == 'routable' - - if connected is not None: - GLib.timeout_add_seconds( - 2, update_connection_state, - connected) - - -def appeared(connection, name, name_owner, *user_data): - global supported - supported = True - log.info('%s appeared', name) - if name == 'org.freedesktop.NetworkManager': - connection.signal_subscribe( - 'org.freedesktop.NetworkManager', - None, - 'StateChanged', - '/org/freedesktop/NetworkManager', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - elif name == 'org.freedesktop.network1': - connection.signal_subscribe( - 'org.freedesktop.network1', - None, - 'PropertiesChanged', - '/org/freedesktop/network1', - None, - Gio.DBusSignalFlags.NONE, - signal_received, - None) - - -def update_connection_state(connected): - if connected: - for connection in app.connections.values(): - log.info('Connect %s', connection.name) - connection.reconnect() - else: - for connection in app.connections.values(): - if connection.connected > 1: - log.info('Disconnect %s', connection.name) - connection.disconnectedReconnCB() - - -watch_name('org.freedesktop.NetworkManager') -watch_name('org.freedesktop.network1') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c07a56bfed017cd34522937d5c1449fd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9c07a56bfed017cd34522937d5c1449fd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Port music_track_listener to GTK dbus
by Philipp Hörist 04 Jan '18

04 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 81a03985 by André Apitzsch at 2018-01-04T21:49:16+01:00 Port music_track_listener to GTK dbus - - - - - 9c07a56b by Philipp Hörist at 2018-01-04T22:05:41+01:00 Merge branch 'music' into 'master' Port music_track_listener to GTK dbus See merge request gajim/gajim!172 - - - - - 3 changed files: - gajim/gui_interface.py - gajim/music_track_listener.py - gajim/roster_window.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -56,9 +56,10 @@ from gajim.common import events from gajim.common import dbus_support if dbus_support.supported: - from gajim.music_track_listener import MusicTrackListener import dbus +from gajim.music_track_listener import MusicTrackListener + if app.HAVE_GEOCLUE: from gajim.common import location_listener @@ -1135,7 +1136,7 @@ class Interface: if connected == invisible_show: return # send currently played music - if (obj.conn.pep_supported and dbus_support.supported and + if (obj.conn.pep_supported and sys.platform == 'linux' and app.config.get_per('accounts', account, 'publish_tune')): self.enable_music_listener() # enable location listener @@ -2192,8 +2193,6 @@ class Interface: if not self.music_track_changed_signal: self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) - track = listener.get_playing_track() - self.music_track_changed(listener, track) def disable_music_listener(self): listener = MusicTrackListener.get() @@ -2207,9 +2206,7 @@ class Interface: else: accounts = [account] - is_paused = hasattr(music_track_info, 'paused') and \ - music_track_info.paused == 0 - if not music_track_info or is_paused: + if music_track_info is None or music_track_info.paused: artist = title = source = '' else: artist = music_track_info.artist ===================================== gajim/music_track_listener.py ===================================== --- a/gajim/music_track_listener.py +++ b/gajim/music_track_listener.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -## src/music_track_listener.py +## gajim/music_track_listener.py ## ## Copyright (C) 2006 Gustavo Carneiro <gjcarneiro AT gmail.com> ## Nikos Kouremenos <kourem AT gmail.com> @@ -23,25 +23,40 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import logging + from gi.repository import GObject -if __name__ == '__main__': - # install _() func before importing dbus_support - from gajim.common import i18n +from gi.repository import Gio, GLib + +log = logging.getLogger('gajim.music_track_listener') + + +def _get_music_players(): + players = [ + 'org.mpris.MediaPlayer2.audacious', + 'org.mpris.MediaPlayer2.bmp', + 'org.mpris.MediaPlayer2.GnomeMusic', + 'org.mpris.MediaPlayer2.quodlibet', + 'org.mpris.MediaPlayer2.rhythmbox', + 'org.mpris.MediaPlayer2.vlc', + 'org.mpris.MediaPlayer2.xmms2' + ] + + return players -from gajim.common import dbus_support -if dbus_support.supported: - import dbus class MusicTrackInfo(object): __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', - 'paused'] + 'paused'] + class MusicTrackListener(GObject.GObject): __gsignals__ = { - 'music-track-changed': (GObject.SignalFlags.RUN_LAST, None, (object,)), + 'music-track-changed': (GObject.SignalFlags.RUN_LAST, None, (object,)), } _instance = None + @classmethod def get(cls): if cls._instance is None: @@ -51,253 +66,117 @@ class MusicTrackListener(GObject.GObject): def __init__(self): super(MusicTrackListener, self).__init__() self._last_playing_music = None + self.con = {} + + players = _get_music_players() + for name in players: + Gio.bus_watch_name( + Gio.BusType.SESSION, + name, + Gio.BusNameWatcherFlags.NONE, + self._appeared, + self._vanished) + + def _appeared(self, connection, name, name_owner, *user_data): + '''Set up a listener for music player signals''' + log.info('%s appeared', name) + self.con[name] = connection.signal_subscribe( + name, + 'org.freedesktop.DBus.Properties', + 'PropertiesChanged', + '/org/mpris/MediaPlayer2', + None, + Gio.DBusSignalFlags.NONE, + self._signal_received, + name) + + info = self.get_playing_track(name) + if info is not None: + self._last_playing_music = info + self.emit('music-track-changed', info) - bus = dbus.SessionBus() - - ## MPRIS - bus.add_signal_receiver(self._mpris_music_track_change_cb, 'TrackChange', - 'org.freedesktop.MediaPlayer') - bus.add_signal_receiver(self._mpris_playing_changed_cb, 'StatusChange', - 'org.freedesktop.MediaPlayer') - bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', - arg0='org.freedesktop.MediaPlayer') - - ## Muine - bus.add_signal_receiver(self._muine_music_track_change_cb, 'SongChanged', - 'org.gnome.Muine.Player') - bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.gnome.Muine') - bus.add_signal_receiver(self._player_playing_changed_cb, 'StateChanged', - 'org.gnome.Muine.Player') - - ## Rhythmbox - bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.gnome.Rhythmbox') - bus.add_signal_receiver(self._rhythmbox_playing_changed_cb, - 'playingChanged', 'org.gnome.Rhythmbox.Player') - bus.add_signal_receiver(self._player_playing_song_property_changed_cb, - 'playingSongPropertyChanged', 'org.gnome.Rhythmbox.Player') - - ## Banshee - bus.add_signal_receiver(self._banshee_state_changed_cb, - 'StateChanged', 'org.bansheeproject.Banshee.PlayerEngine') - bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', - arg0='org.bansheeproject.Banshee') - - ## Quod Libet - bus.add_signal_receiver(self._quodlibet_state_change_cb, - 'SongStarted', 'net.sacredchao.QuodLibet') - bus.add_signal_receiver(self._quodlibet_state_change_cb, - 'Paused', 'net.sacredchao.QuodLibet') - bus.add_signal_receiver(self._quodlibet_state_change_cb, - 'Unpaused', 'net.sacredchao.QuodLibet') - bus.add_signal_receiver(self._player_name_owner_changed, - 'NameOwnerChanged', 'org.freedesktop.DBus', - arg0='net.sacredchao.QuodLibet') - - def _player_name_owner_changed(self, name, old, new): - if not new: - self.emit('music-track-changed', None) + def _vanished(self, connection, name, *user_data): + log.info('%s vanished', name) + if name in self.con: + connection.signal_unsubscribe( + self.con[name]) + self.con.pop(name) - def _player_playing_changed_cb(self, playing): - if playing: - self.emit('music-track-changed', self._last_playing_music) - else: self.emit('music-track-changed', None) - def _player_playing_song_property_changed_cb(self, a, b, c, d): - if b == 'rb:stream-song-title': - self.emit('music-track-changed', self._last_playing_music) + def _signal_received(self, connection, sender_name, object_path, + interface_name, signal_name, parameters, *user_data): + '''Signal handler for PropertiesChanged event''' - def _mpris_properties_extract(self, song): - info = MusicTrackInfo() - info.title = song.get('title', '') - info.album = song.get('album', '') - info.artist = song.get('artist', '') - info.duration = int(song.get('length', 0)) - return info - - def _mpris_playing_changed_cb(self, playing): - if type(playing) is dbus.Struct: - if playing[0]: - self.emit('music-track-changed', None) - else: - self.emit('music-track-changed', self._last_playing_music) - else: # Workaround for e.g. Audacious - if playing: - self.emit('music-track-changed', None) - else: - self.emit('music-track-changed', self._last_playing_music) + if 'PlaybackStatus' not in parameters[1]: + return - def _mpris_music_track_change_cb(self, arg): - self._last_playing_music = self._mpris_properties_extract(arg) - self.emit('music-track-changed', self._last_playing_music) + log.info('Signal received: %s - %s', interface_name, parameters) - def _muine_properties_extract(self, song_string): - d = dict((x.strip() for x in s1.split(':', 1)) for s1 in \ - song_string.split('\n')) - info = MusicTrackInfo() - info.title = d['title'] - info.album = d['album'] - info.artist = d['artist'] - info.duration = int(d['duration']) - info.track_number = int(d['track_number']) - return info + info = self.get_playing_track(user_data[0]) + self._last_playing_music = info - def _muine_music_track_change_cb(self, arg): - info = self._muine_properties_extract(arg) self.emit('music-track-changed', info) - def _rhythmbox_playing_changed_cb(self, playing): - if playing: - info = self.get_playing_track() - self.emit('music-track-changed', info) - else: - self.emit('music-track-changed', None) - - def _rhythmbox_properties_extract(self, props): - info = MusicTrackInfo() - info.title = props.get('title', None) - info.album = props.get('album', None) - info.artist = props.get('artist', None) - info.duration = int(props.get('duration', 0)) - info.track_number = int(props.get('track-number', 0)) - return info - - def _banshee_state_changed_cb(self, state): - if state == 'playing': - bus = dbus.SessionBus() - banshee = bus.get_object('org.bansheeproject.Banshee', - '/org/bansheeproject/Banshee/PlayerEngine') - currentTrack = banshee.GetCurrentTrack() - self._last_playing_music = self._banshee_properties_extract( - currentTrack) - self.emit('music-track-changed', self._last_playing_music) - elif state == 'paused': - self.emit('music-track-changed', None) + def _properties_extract(self, properties): + meta = properties.get('Metadata') + if meta is None or not meta: + return None - def _banshee_properties_extract(self, props): info = MusicTrackInfo() - info.title = props.get('name', None) - info.album = props.get('album', None) - info.artist = props.get('artist', None) - info.duration = int(props.get('length', 0)) - return info - - def _quodlibet_state_change_cb(self, state=None): - info = self.get_playing_track() - if info: - self.emit('music-track-changed', info) + info.title = meta.get('xesam:title') + info.album = meta.get('xesam:album') + artist = meta.get('xesam:artist') + if artist is not None and len(artist): + info.artist = artist[0] else: - self.emit('music-track-changed', None) + info.artist = None + info.duration = float(meta.get('mpris:length', 0)) + info.track_number = meta.get('xesam:trackNumber', 0) + + status = properties.get('PlaybackStatus') + info.paused = status is not None and status == 'Paused' - def _quodlibet_properties_extract(self, props): - info = MusicTrackInfo() - info.title = props.get('title', None) - info.album = props.get('album', None) - info.artist = props.get('artist', None) - info.duration = float(props.get('~#length', 0)) return info - def get_playing_track(self): + def get_playing_track(self, name): '''Return a MusicTrackInfo for the currently playing song, or None if no song is playing''' - - bus = dbus.SessionBus() - - ## Check Muine playing track - test = False - if hasattr(bus, 'name_has_owner'): - if bus.name_has_owner('org.gnome.Muine'): - test = True - elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), - 'org.gnome.Muine'): - test = True - if test: - obj = bus.get_object('org.gnome.Muine', '/org/gnome/Muine/Player') - player = dbus.Interface(obj, 'org.gnome.Muine.Player') - if player.GetPlaying(): - song_string = player.GetCurrentSong() - song = self._muine_properties_extract(song_string) - self._last_playing_music = song - return song - - ## Check Rhythmbox playing song - test = False - if hasattr(bus, 'name_has_owner'): - if bus.name_has_owner('org.gnome.Rhythmbox'): - test = True - elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), - 'org.gnome.Rhythmbox'): - test = True - if test: - rbshellobj = bus.get_object('org.gnome.Rhythmbox', - '/org/gnome/Rhythmbox/Shell') - player = dbus.Interface( - bus.get_object('org.gnome.Rhythmbox', - '/org/gnome/Rhythmbox/Player'), 'org.gnome.Rhythmbox.Player') - rbshell = dbus.Interface(rbshellobj, 'org.gnome.Rhythmbox.Shell') - try: - uri = player.getPlayingUri() - except dbus.DBusException: - uri = None - if not uri: + proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.NONE, + None, + name, + '/org/mpris/MediaPlayer2', + 'org.freedesktop.DBus.Properties', + None) + + try: + result = proxy.call_sync( + "GetAll", + GLib.Variant('(s)', ('org.mpris.MediaPlayer2.Player',)), + Gio.DBusCallFlags.NONE, + -1, + None) + except GLib.Error as e: + if e.domain == 'g-dbus-error-quark': + log.debug("Could not enable music listener: %s", e.message) return None - props = rbshell.getSongProperties(uri) - info = self._rhythmbox_properties_extract(props) + else: + raise + else: + info = self._properties_extract(result[0]) self._last_playing_music = info return info - ## Check Banshee playing track - test = False - if hasattr(bus, 'name_has_owner'): - if bus.name_has_owner('org.bansheeproject.Banshee'): - test = True - elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), - 'org.bansheeproject.Banshee'): - test = True - if test: - banshee = bus.get_object('org.bansheeproject.Banshee', - '/org/bansheeproject/Banshee/PlayerEngine') - currentTrack = banshee.GetCurrentTrack() - if currentTrack: - song = self._banshee_properties_extract(currentTrack) - self._last_playing_music = song - return song - - ## Check Quod Libet playing track - test = False - if hasattr(bus, 'name_has_owner'): - if bus.name_has_owner('net.sacredchao.QuodLibet'): - test = True - elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(), - 'net.sacredchao.QuodLibet'): - test = True - if test: - quodlibet = bus.get_object('net.sacredchao.QuodLibet', - '/net/sacredchao/QuodLibet') - if quodlibet.IsPlaying(): - currentTrack = quodlibet.CurrentSong() - song = self._quodlibet_properties_extract(currentTrack) - self._last_playing_music = song - return song - - return None # here we test :) if __name__ == '__main__': def music_track_change_cb(listener, music_track_info): - if music_track_info is None: + if music_track_info is None or music_track_info.paused: print('Stop!') else: print(music_track_info.title) listener = MusicTrackListener.get() listener.connect('music-track-changed', music_track_change_cb) - track = listener.get_playing_track() - if track is None: - print('Now not playing anything') - else: - print('Now playing: "%s" by %s' % (track.title, track.artist)) GObject.MainLoop().run() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -40,6 +40,7 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio import os +import sys import time import locale import hashlib @@ -67,7 +68,6 @@ from gajim.common import i18n if app.HAVE_GEOCLUE: from gajim.common import location_listener from gajim.common import ged -from gajim.common import dbus_support from gajim.message_window import MessageWindowMgr from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE @@ -4963,7 +4963,7 @@ class RosterWindow: item = Gtk.CheckMenuItem(_('Publish Tune')) pep_submenu.append(item) - if not dbus_support.supported: + if sys.platform != 'linux': item.set_sensitive(False) else: activ = app.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84aa61335fde3eeccddfc55dc5f9203c4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/84aa61335fde3eeccddfc55dc5f9203c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HtmlTextView: Fix some things
by Philipp Hörist 04 Jan '18

04 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84aa6133 by Philipp Hörist at 2018-01-04T18:04:56+01:00 HtmlTextView: Fix some things - Only pass args to logging function - Dont use 'size' as global var, its again used later in methods - Fix a missing arg in __parse_font_size_cb() - - - - - 2 changed files: - gajim/common/gpg.py - gajim/htmltextview.py Changes: ===================================== gajim/common/gpg.py ===================================== --- a/gajim/common/gpg.py +++ b/gajim/common/gpg.py @@ -111,6 +111,7 @@ if app.HAVE_GPG: def get_keys(self, secret=False): keys = {} result = super(GnuPG, self).list_keys(secret=secret) + for key in result: # Take first not empty uid keys[key['keyid'][8:]] = [uid for uid in key['uids'] if uid][0] ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -186,9 +186,9 @@ LIST_ELEMS = set( 'dl, ol, ul'.split(', ')) for name in BLOCK_HEAD: num = eval(name[1]) - size = (num-1) // 2 + header_size = (num-1) // 2 weigth = (num - 1) % 2 - element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[size], + element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[header_size], ('font-weight: bold', 'font-style: oblique')[weigth],) def _parse_css_color(color): @@ -286,7 +286,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): try: val = float(value[:-2]) except: - log.warning('Unable to parse length value "%s"' % value) + log.warning('Unable to parse length value "%s"', value) return None if val > 0: sign = 1 @@ -328,16 +328,15 @@ class HtmlHandler(xml.sax.handler.ContentHandler): val = sign*max(5, min(abs(val), 70)) callback(val, 'px', *args) except Exception: - log.warning('Unable to parse length value "%s"' % value) + log.warning('Unable to parse length value "%s"', value) - def __parse_font_size_cb(size, type_, tag): + def __parse_font_size_cb(self, size, type_, tag): if type_ in ('em', '%'): tag.set_property('scale', size) elif type_ == 'pt': tag.set_property('size-points', size) elif type_ == 'px': tag.set_property('size-points', self._get_points_from_pixels(size)) - __parse_font_size_cb = staticmethod(__parse_font_size_cb) def _parse_style_display(self, tag, value): if value == 'none': @@ -378,8 +377,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.set_property('scale', 1.2) return # font relative (5 ~ 4pt, 110 ~ 72pt) - self._parse_length(value, True, False, 5, 110,self.__parse_font_size_cb, - tag) + self._parse_length( + value, True, False, 5, 110, self.__parse_font_size_cb, tag) def _parse_style_font_style(self, tag, value): try: @@ -389,7 +388,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): 'oblique': Pango.Style.OBLIQUE, } [value] except KeyError: - log.warning('unknown font-style %s' % value) + log.warning('unknown font-style %s', value) else: tag.set_property('style', style) @@ -398,7 +397,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): if styles: length += styles[-1].get_property(propname) tag.set_property(propname, length) - #__frac_length_tag_cb = staticmethod(__frac_length_tag_cb) def _parse_style_margin_left(self, tag, value): # block relative @@ -427,7 +425,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): 'bold': Pango.Weight.BOLD, } [value] except KeyError: - log.warning('unknown font-style %s' % value) + log.warning('unknown font-style %s', value) else: tag.set_property('weight', weight) @@ -443,7 +441,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): 'justify': Gtk.Justification.FILL, } [value] except KeyError: - log.warning('Invalid text-align:%s requested' % value) + log.warning('Invalid text-align: %s requested', value) else: tag.set_property('justification', align) @@ -477,8 +475,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): try: tag.set_property(propname, value) except Exception: - log.warning( "Error with prop: " + propname + " for tag: " + str(tag)) - + log.warning('Error with prop: %s for tag: %s', propname, str(tag)) def _parse_style_width(self, tag, value): if value == 'auto': @@ -497,11 +494,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler): for style in ('background-color', 'color', 'font-family', 'font-size', 'font-style', 'font-weight', 'margin-left', 'margin-right', 'text-align', 'text-decoration', 'white-space', 'display', - 'width', 'height' ): + 'width', 'height'): try: method = locals()['_parse_style_%s' % style.replace('-', '_')] except KeyError: - log.warning('Style attribute "%s" not yet implemented' % style) + log.warning('Style attribute "%s" not yet implemented', style) else: __style_methods[style] = method del style @@ -629,7 +626,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): else: self._insert_text('[IMG: %s]' % alt, working_iter) except Exception as ex: - log.error('Error loading image ' + str(ex)) + log.error('Error loading image %s', str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') try: @@ -654,7 +651,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): method = self.__style_methods[attr] except KeyError: log.warning('Style attribute "%s" requested ' - 'but not yet implemented' % attr) + 'but not yet implemented', attr) else: method(self, tag, val) self.styles.append(tag) @@ -793,7 +790,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): elif name in INLINE: pass else: - log.warning('Unhandled element "%s"' % name) + log.warning('Unhandled element "%s"', name) def endElement(self, name): endPreserving = False @@ -825,7 +822,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): elif name in BLOCK_STRUCT: newLine = True else: - log.warning("Unhandled element '%s'" % name) + log.warning("Unhandled element '%s'", name) self._flush_text() if endPreserving: self.preserve = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84aa61335fde3eeccddfc55dc5f9203c4b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84aa61335fde3eeccddfc55dc5f9203c4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Detect invalid file handles when passed to SelectIdleQueue
by Yann Leboulanger 04 Jan '18

04 Jan '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: e230629a by Jeff 'Raid' Baitis at 2018-01-02T22:14:34-08:00 Detect invalid file handles when passed to SelectIdleQueue - - - - - a80515dc by Yann Leboulanger at 2018-01-04T13:50:27+01:00 Merge branch 'master' into 'master' Detect invalid file handles when passed to SelectIdleQueue See merge request gajim/python-nbxmpp!12 - - - - - 1 changed file: - nbxmpp/idlequeue.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== --- a/nbxmpp/idlequeue.py +++ b/nbxmpp/idlequeue.py @@ -21,6 +21,7 @@ objects and be informed about possible IO from __future__ import unicode_literals import os +import errno import sys import select import logging @@ -59,7 +60,6 @@ PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event IS_CLOSED = 16 # channel closed - def get_idlequeue(): """ Get an appropriate idlequeue @@ -353,7 +353,7 @@ class IdleQueue(object): :param obj: the IdleObject :param writable: True if obj has data to sent - :param readable: True if obj expects data to be reiceived + :param readable: True if obj expects data to be received """ if obj.fd == -1: return @@ -438,16 +438,15 @@ class IdleQueue(object): return True try: waiting_descriptors = self.selector.poll(0) - except select.error as e: + except OSError as e: waiting_descriptors = [] - if e[0] != 4: # interrupt + if e.errno != errno.EINTR: raise for fd, flags in waiting_descriptors: self._process_events(fd, flags) self._check_time_events() return True - class SelectIdleQueue(IdleQueue): """ Extends IdleQueue to use select.select() for polling @@ -456,6 +455,31 @@ class SelectIdleQueue(IdleQueue): support io_add_watch properly (yet) """ + def checkQueue(self): + """ + Iterates through all known file descriptors and uses os.stat to check if they're valid. + Greatly improves performance if the caller hands us and expects notification on an invalid file handle. + """ + bad_fds=[] + union={} + union.update(self.write_fds) + union.update(self.read_fds) + union.update(self.error_fds) + for fd in (union.keys()): + try: + status = os.stat(fd) + except OSError as e: + # This file descriptor is invalid. Add to list for closure. + bad_fds.append(fd) + + for fd in (bad_fds): + obj = self.queue.get(fd) + if obj is None: + self.unplug_idle(fd) + return + self.remove_timeout(fd) + self.unplug_idle(fd) + def _init_idle(self): """ Create a dict, which maps file/pipe/sock descriptor to glib event id @@ -466,7 +490,7 @@ class SelectIdleQueue(IdleQueue): def _add_idle(self, fd, flags): """ - This method is called when we plug a new idle object. Remove descriptor + This method is called when we plug a new idle object. Add descriptor to read/write/error lists, according flags """ if flags & 3: @@ -494,9 +518,10 @@ class SelectIdleQueue(IdleQueue): try: waiting_descriptors = select.select(list(self.read_fds.keys()), list(self.write_fds.keys()), list(self.error_fds.keys()), 0) - except select.error as e: + except OSError as e: waiting_descriptors = ((), (), ()) - if e[0] != 4: # interrupt + if e.errno != errno.EINTR: + self.checkQueue() raise for fd in waiting_descriptors[0]: q = self.queue.get(fd) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ae4435eae456d0e89341b9e39… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/ae4435eae456d0e89341b9e39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add ALPN Support
by Philipp Hörist 03 Jan '18

03 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32e873e6 by Philipp Hörist at 2018-01-03T22:11:42+01:00 Add ALPN Support - - - - - bd3d195b by Philipp Hörist at 2018-01-03T22:13:33+01:00 Stick to pillow version on Windows build 4.3.0 compiles fine on msys2, later version current not. - - - - - d3890585 by Philipp Hörist at 2018-01-04T00:08:12+01:00 Refactor css font size parsing - Get rid of deprecated Gdk.Screen methods - remove support for 'ex' unit - not easily correct implemented and not commonly used Fixes #8491 - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/helpers.py - gajim/htmltextview.py - win/_base.sh Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -63,6 +63,7 @@ from gajim.common import passwords from gajim.common import exceptions from gajim.common import check_X509 from gajim.common.connection_handlers import * +from gajim.common.helpers import version_condition from gajim.gtkgui_helpers import get_action @@ -1079,9 +1080,9 @@ class Connection(CommonConnection, ConnectionHandlers): # SRV resolver self._proxy = proxy self._hosts = [ - {'host': h, 'port': p, 'type': 'tls', 'prio': 10, 'weight': 10}, - {'host': h, 'port': ssl_p, 'type': 'ssl', 'prio': 10, 'weight': 10}, - {'host': h, 'port': p, 'type': 'plain', 'prio': 10, 'weight': 10} + {'host': h, 'port': p, 'type': 'tls', 'prio': 10, 'weight': 10, 'alpn': False}, + {'host': h, 'port': ssl_p, 'type': 'ssl', 'prio': 10, 'weight': 10, 'alpn': False}, + {'host': h, 'port': p, 'type': 'plain', 'prio': 10, 'weight': 10, 'alpn': False} ] self._hostname = hostname @@ -1110,9 +1111,11 @@ class Connection(CommonConnection, ConnectionHandlers): for record in result: service = host[1:] if service.startswith(SERVICE_START_TLS): + record['alpn'] = False self._append_srv_record(record, 'tls') self._append_srv_record(record, 'plain') elif service.startswith(SERVICE_DIRECT_TLS): + record['alpn'] = True self._append_srv_record(record, 'ssl') self._num_pending_srv_records -= 1 @@ -1209,8 +1212,13 @@ class Connection(CommonConnection, ConnectionHandlers): 'tls_version') cipher_list = app.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, tls_version, - cipher_list) + + if version_condition(nbxmpp.__version__, '0.6.3'): + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, + cipher_list, self._current_host['alpn']) + else: + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, + cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname, @@ -1244,7 +1252,7 @@ class Connection(CommonConnection, ConnectionHandlers): on_connect_failure=self._connect_to_next_host, on_stream_error_cb=self._StreamCB, proxy=self._proxy, - secure_tuple = secure_tuple) + secure_tuple=secure_tuple) def log_hosttype_info(self, port): msg = '>>>>>> Connecting to %s [%s:%d], type = %s' % (self.name, ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -44,6 +44,7 @@ from gajim.common import caps_cache import socket import time from datetime import datetime, timedelta, timezone, tzinfo +from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from string import Template @@ -1586,3 +1587,8 @@ def download_image(account, attrs): if proxy and proxy['type'] in ('http', 'socks5'): return _get_img_proxy(attrs, proxy) return _get_img_direct(attrs) + +def version_condition(current_version, required_version): + if V(current_version) < V(required_version): + return False + return True ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -67,10 +67,6 @@ __all__ = ['HtmlTextView'] whitespace_rx = re.compile('\\s+') allwhitespace_rx = re.compile('^\\s*$') -# pixels = points * display_resolution -display_resolution = 0.3514598*(Gdk.Screen.height() / - float(Gdk.Screen.height_mm())) - # embryo of CSS classes classes = { #'system-message':';display: none', @@ -227,6 +223,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler): self.list_counters = [] # stack (top at head) of list # counters, or None for unordered list + def _get_points_from_pixels(self, pixels): + resolution = self.textview.get_screen().get_resolution() + # points = pixels * 72 / resolution + return pixels * 72 / resolution + def _parse_style_color(self, tag, value): color = _parse_css_color(value) tag.set_property('foreground-gdk', color) @@ -236,7 +237,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): tag.set_property('background-gdk', color) tag.set_property('paragraph-background-gdk', color) - def _get_current_attributes(self): attrs = self.textview.get_default_attributes() self.iter.backward_char() @@ -266,10 +266,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): val = sign*max(1, min(abs(val), 500)) frac = val/100 if font_relative: - attrs = self._get_current_attributes() - if not attrs.font: - font_size = self.get_font_size() - callback(frac*display_resolution*font_size, *args) + callback(frac, '%', *args) elif block_relative: # CSS says 'Percentage values: refer to width of the closest # block-level ancestor' @@ -285,8 +282,12 @@ class HtmlHandler(xml.sax.handler.ContentHandler): callback(frac, *args) return - def get_val(): - val = float(value[:-2]) + def get_val(min_val=minl, max_val=maxl): + try: + val = float(value[:-2]) + except: + log.warning('Unable to parse length value "%s"' % value) + return None if val > 0: sign = 1 elif val < 0: @@ -294,27 +295,24 @@ class HtmlHandler(xml.sax.handler.ContentHandler): else: sign = 0 # validate length - return sign*max(minl, min(abs(val*display_resolution), maxl)) - if value.endswith('pt'): # points - callback(get_val()*display_resolution, *args) - - elif value.endswith('em'): # ems, the width of the element's font - attrs = self._get_current_attributes() - if not attrs.font: - font_size = self.get_font_size() - callback(get_val()*display_resolution*font_size, *args) - - elif value.endswith('ex'): # x-height, ~ the height of the letter 'x' - # FIXME: figure out how to calculate this correctly - # for now 'em' size is used as approximation - - attrs = self._get_current_attributes() - if not attrs.font: - font_size = self.get_font_size() - callback(get_val()*display_resolution*font_size, *args) - - elif value.endswith('px'): # pixels - callback(get_val(), *args) + return sign*max(min_val, min(abs(val), max_val)) + if value.endswith('pt'): # points + size = get_val(5, 50) + if size is None: + return + callback(size, 'pt', *args) + + elif value.endswith('em'): + size = get_val(0.3, 4) + if size is None: + return + callback(size, 'em', *args) + + elif value.endswith('px'): # pixels + size = get_val(5, 50) + if size is None: + return + callback(size, 'px', *args) else: try: @@ -327,13 +325,18 @@ class HtmlHandler(xml.sax.handler.ContentHandler): else: sign = 0 # validate length - val = sign*max(minl, min(abs(val), maxl)) - callback(val, *args) + val = sign*max(5, min(abs(val), 70)) + callback(val, 'px', *args) except Exception: log.warning('Unable to parse length value "%s"' % value) - def __parse_font_size_cb(length, tag): - tag.set_property('size-points', length/display_resolution) + def __parse_font_size_cb(size, type_, tag): + if type_ in ('em', '%'): + tag.set_property('scale', size) + elif type_ == 'pt': + tag.set_property('size-points', size) + elif type_ == 'px': + tag.set_property('size-points', self._get_points_from_pixels(size)) __parse_font_size_cb = staticmethod(__parse_font_size_cb) def _parse_style_display(self, tag, value): @@ -830,10 +833,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler): self._jump_line() self._end_span() - def get_font_size(self): - context = self.conv_textview.tv.get_style_context() - font = context.get_font(Gtk.StateType.NORMAL) - return font.get_size() / Pango.SCALE class HtmlTextView(Gtk.TextView): ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -93,7 +93,7 @@ python-gnupg docutils qrcode keyring -pillow +pillow==4.3.0 " build_pip install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1d45ec008b2ead33e203f5eb3844c0bd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1d45ec008b2ead33e203f5eb3844c0bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix tests
by Yann Leboulanger 02 Jan '18

02 Jan '18

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: ae4435ea by Yann Leboulanger at 2018-01-03T00:33:45+01:00 fix tests - - - - - 1 changed file: - test/unit/test_xmpp_transports_nb2.py Changes: ===================================== test/unit/test_xmpp_transports_nb2.py ===================================== --- a/test/unit/test_xmpp_transports_nb2.py +++ b/test/unit/test_xmpp_transports_nb2.py @@ -84,6 +84,7 @@ class TestNonBlockingTCP(AbstractTransportTest): certs=('../data/other/cacerts.pem', 'tmp/cacerts.pem'), tls_version=None, cipher_list=None, + alpn=True, proxy_dict=proxy_dict) self.socket.PlugIn(self) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ae4435eae456d0e89341b9e391… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ae4435eae456d0e89341b9e391… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Revert "test"
by Philipp Hörist 02 Jan '18

02 Jan '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e0037313 by Philipp Hörist at 2018-01-02T23:57:57+01:00 Revert "test" This reverts commit 1d2da3723cba600c73fd609d0b7f6e798491a2dd - - - - - 1 changed file: - nbxmpp/idlequeue.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== --- a/nbxmpp/idlequeue.py +++ b/nbxmpp/idlequeue.py @@ -21,7 +21,6 @@ objects and be informed about possible IO from __future__ import unicode_literals import os -import errno import sys import select import logging @@ -60,6 +59,7 @@ PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event IS_CLOSED = 16 # channel closed + def get_idlequeue(): """ Get an appropriate idlequeue @@ -71,7 +71,6 @@ def get_idlequeue(): if HAVE_GLIB: # Gajim's default Idlequeue return GlibIdleQueue() - #return SelectIdleQueue() else: # GUI less implementation return SelectIdleQueue() @@ -354,7 +353,7 @@ class IdleQueue(object): :param obj: the IdleObject :param writable: True if obj has data to sent - :param readable: True if obj expects data to be received + :param readable: True if obj expects data to be reiceived """ if obj.fd == -1: return @@ -439,15 +438,16 @@ class IdleQueue(object): return True try: waiting_descriptors = self.selector.poll(0) - except OSError as e: + except select.error as e: waiting_descriptors = [] - if e.errno != errno.EINTR: + if e[0] != 4: # interrupt raise for fd, flags in waiting_descriptors: self._process_events(fd, flags) self._check_time_events() return True + class SelectIdleQueue(IdleQueue): """ Extends IdleQueue to use select.select() for polling @@ -456,32 +456,6 @@ class SelectIdleQueue(IdleQueue): support io_add_watch properly (yet) """ - def checkQueue(self): - """ - Iterates through all known file descriptors and uses os.stat to check if they're valid. - Greatly improves performance if the caller hands us and expects notification on an invalid file handle. - """ - bad_fds=[] - union={} - union.update(self.write_fds) - union.update(self.read_fds) - union.update(self.error_fds) - for fd in (union.keys()): - try: - status = os.stat(fd) - print("Status of "+str(fd)+" is: " + str(status)) - except OSError as e: - # This file descriptor is invalid. Add to list for closure. - bad_fds.append(fd) - - for fd in (bad_fds): - obj = self.queue.get(fd) - if obj is None: - self.unplug_idle(fd) - return - self.remove_timeout(fd) - self.unplug_idle(fd) - def _init_idle(self): """ Create a dict, which maps file/pipe/sock descriptor to glib event id @@ -492,7 +466,7 @@ class SelectIdleQueue(IdleQueue): def _add_idle(self, fd, flags): """ - This method is called when we plug a new idle object. Add descriptor + This method is called when we plug a new idle object. Remove descriptor to read/write/error lists, according flags """ if flags & 3: @@ -519,11 +493,10 @@ class SelectIdleQueue(IdleQueue): return True try: waiting_descriptors = select.select(list(self.read_fds.keys()), - list(self.write_fds.keys()), list(self.error_fds.keys()),0) - except OSError as e: + list(self.write_fds.keys()), list(self.error_fds.keys()), 0) + except select.error as e: waiting_descriptors = ((), (), ()) - if e.errno != errno.EINTR: - self.checkQueue() + if e[0] != 4: # interrupt raise for fd in waiting_descriptors[0]: q = self.queue.get(fd) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e0037313e7aee17f3188cbfc14… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e0037313e7aee17f3188cbfc14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: test
by Philipp Hörist 02 Jan '18

02 Jan '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 1d2da372 by Philipp Hörist at 2017-12-29T13:02:13+01:00 test - - - - - 1ccd0dd7 by Philipp Hörist at 2018-01-02T23:50:10+01:00 Add ALPN support This is necessary for XEP-0368 - - - - - 4 changed files: - nbxmpp/client_nb.py - nbxmpp/idlequeue.py - nbxmpp/tls_nb.py - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/client_nb.py ===================================== --- a/nbxmpp/client_nb.py +++ b/nbxmpp/client_nb.py @@ -72,6 +72,7 @@ class NonBlockingClient(object): self.stream_started = False self.disconnecting = False self.protocol_type = 'XMPP' + self.alpn = False def disconnect(self, message=''): """ @@ -150,7 +151,7 @@ class NonBlockingClient(object): def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, on_proxy_failure=None, on_stream_error_cb=None, proxy=None, - secure_tuple=('tls', None, None, None, None)): + secure_tuple=('tls', None, None, None, None, False)): """ Open XMPP connection (open XML streams in both directions) @@ -165,19 +166,22 @@ class NonBlockingClient(object): values for keys 'host' and 'port' - connection details for proxy serve and optionally keys 'user' and 'pass' as proxy credentials :param secure_tuple: tuple of (desired connection type, cacerts, - mycerts, tls_version, cipher_list) + mycerts, tls_version, cipher_list, alpn) connection type can be 'ssl' - TLS established after TCP connection, 'tls' - TLS established after negotiation with starttls, or 'plain'. - cacerts, mycerts, tls_version, cipher_list - see tls_nb.NonBlockingTLS - constructor for more details + cacerts, mycerts, tls_version, cipher_list, alpn + see tls_nb.NonBlockingTLS constructor for more details """ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure self.on_stream_error_cb = on_stream_error_cb self.desired_security, self.cacerts, self.mycerts, self.tls_version, \ - self.cipher_list = secure_tuple + self.cipher_list = secure_tuple[:5] + if len(secure_tuple) == 6: + # ALPN support was added in version 0.6.3 + self.alpn = secure_tuple[5] self.Connection = None self.Port = port self.proxy = proxy @@ -239,6 +243,7 @@ class NonBlockingClient(object): certs=certs, tls_version = self.tls_version, cipher_list = self.cipher_list, + alpn=self.alpn, proxy_dict=proxy_dict) # plug transport into client as self.Connection ===================================== nbxmpp/idlequeue.py ===================================== --- a/nbxmpp/idlequeue.py +++ b/nbxmpp/idlequeue.py @@ -21,6 +21,7 @@ objects and be informed about possible IO from __future__ import unicode_literals import os +import errno import sys import select import logging @@ -59,7 +60,6 @@ PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event IS_CLOSED = 16 # channel closed - def get_idlequeue(): """ Get an appropriate idlequeue @@ -71,6 +71,7 @@ def get_idlequeue(): if HAVE_GLIB: # Gajim's default Idlequeue return GlibIdleQueue() + #return SelectIdleQueue() else: # GUI less implementation return SelectIdleQueue() @@ -353,7 +354,7 @@ class IdleQueue(object): :param obj: the IdleObject :param writable: True if obj has data to sent - :param readable: True if obj expects data to be reiceived + :param readable: True if obj expects data to be received """ if obj.fd == -1: return @@ -438,16 +439,15 @@ class IdleQueue(object): return True try: waiting_descriptors = self.selector.poll(0) - except select.error as e: + except OSError as e: waiting_descriptors = [] - if e[0] != 4: # interrupt + if e.errno != errno.EINTR: raise for fd, flags in waiting_descriptors: self._process_events(fd, flags) self._check_time_events() return True - class SelectIdleQueue(IdleQueue): """ Extends IdleQueue to use select.select() for polling @@ -456,6 +456,32 @@ class SelectIdleQueue(IdleQueue): support io_add_watch properly (yet) """ + def checkQueue(self): + """ + Iterates through all known file descriptors and uses os.stat to check if they're valid. + Greatly improves performance if the caller hands us and expects notification on an invalid file handle. + """ + bad_fds=[] + union={} + union.update(self.write_fds) + union.update(self.read_fds) + union.update(self.error_fds) + for fd in (union.keys()): + try: + status = os.stat(fd) + print("Status of "+str(fd)+" is: " + str(status)) + except OSError as e: + # This file descriptor is invalid. Add to list for closure. + bad_fds.append(fd) + + for fd in (bad_fds): + obj = self.queue.get(fd) + if obj is None: + self.unplug_idle(fd) + return + self.remove_timeout(fd) + self.unplug_idle(fd) + def _init_idle(self): """ Create a dict, which maps file/pipe/sock descriptor to glib event id @@ -466,7 +492,7 @@ class SelectIdleQueue(IdleQueue): def _add_idle(self, fd, flags): """ - This method is called when we plug a new idle object. Remove descriptor + This method is called when we plug a new idle object. Add descriptor to read/write/error lists, according flags """ if flags & 3: @@ -493,10 +519,11 @@ class SelectIdleQueue(IdleQueue): return True try: waiting_descriptors = select.select(list(self.read_fds.keys()), - list(self.write_fds.keys()), list(self.error_fds.keys()), 0) - except select.error as e: + list(self.write_fds.keys()), list(self.error_fds.keys()),0) + except OSError as e: waiting_descriptors = ((), (), ()) - if e[0] != 4: # interrupt + if e.errno != errno.EINTR: + self.checkQueue() raise for fd in waiting_descriptors[0]: q = self.queue.get(fd) ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -253,7 +253,7 @@ class NonBlockingTLS(PlugIn): PyOpenSSLWrapper. """ - def __init__(self, cacerts, mycerts, tls_version, cipher_list): + def __init__(self, cacerts, mycerts, tls_version, cipher_list, alpn): """ :param cacerts: path to pem file with certificates of known XMPP servers :param mycerts: path to pem file with certificates of user trusted @@ -275,6 +275,7 @@ class NonBlockingTLS(PlugIn): self.tls_version = '1.0' else: self.tls_version = tls_version + self.alpn = alpn def plugin(self, owner): """ @@ -377,6 +378,10 @@ class NonBlockingTLS(PlugIn): # py-OpenSSL < 0.9 or old OpenSSL flags |= 16384 + if self.alpn: + # XEP-0368 set ALPN Protocol + tcpsock._sslContext.set_alpn_protos([b'xmpp-client']) + try: # OpenSSL 1.0.1d supports TLS 1.1 and TLS 1.2 and # fixes renegotiation in TLS 1.1, 1.2 by using the correct TLS version. ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -316,7 +316,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): estabilish TLS connection. """ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, - certs, tls_version, cipher_list, proxy_dict=None): + certs, tls_version, cipher_list, alpn, proxy_dict=None): """ :param proxy_dict: dictionary with proxy data as loaded from config file """ @@ -341,6 +341,8 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): self.ssl_certificate = None self.ssl_errnum = 0 + self.alpn = alpn + # FIXME: transport should not be aware xmpp def start_disconnect(self): NonBlockingTransport.start_disconnect(self) @@ -432,7 +434,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): """ cacerts, mycerts = self.certs result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts, - self.tls_version, self.cipher_list).PlugIn(self) + self.tls_version, self.cipher_list, self.alpn).PlugIn(self) if result: on_succ() else: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/82fafe74e09455811619dde52… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/82fafe74e09455811619dde52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix config encoding
by Philipp Hörist 02 Jan '18

02 Jan '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b1d45ec0 by Philipp Hörist at 2018-01-02T23:55:26+01:00 Fix config encoding Fixes #8834 - - - - - 1 changed file: - gajim/common/optparser.py Changes: ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -112,7 +112,7 @@ class OptionsParser: self.__tempfile = os.path.join(base_dir, '.' + filename) try: f = os.fdopen(os.open(self.__tempfile, - os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0o600), 'w') + os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0o600), 'w', encoding='utf-8') except IOError as e: return str(e) try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1d45ec008b2ead33e203f5eb3844c0bdb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1d45ec008b2ead33e203f5eb3844c0bdb… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2018