Commits

commits@gajim.org

17632 discussions

python-nbxmpp: run test with py3 by default
by Python-nbxmpp 04 Sep '16

04 Sep '16

changeset 721b7bf9b805 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=721b7bf9b805 description: run test with py3 by default diffstat: test/runtests.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 685d8da6d4cf -r 721b7bf9b805 test/runtests.py --- a/test/runtests.py Mon Jul 04 21:48:31 2016 +0200 +++ b/test/runtests.py Sun Sep 04 13:50:08 2016 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 '''

1 0

python-nbxmpp: prepare 0.5.4 release
by Python-nbxmpp 04 Sep '16

04 Sep '16

changeset 88b9f384b07f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=88b9f384b07f description: prepare 0.5.4 release diffstat: ChangeLog | 7 +++++++ nbxmpp/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 721b7bf9b805 -r 88b9f384b07f ChangeLog --- a/ChangeLog Sun Sep 04 13:50:08 2016 +0200 +++ b/ChangeLog Sun Sep 04 13:50:23 2016 +0200 @@ -1,3 +1,10 @@ +python-nbxmpp 0.5.4 (04 September 2016) + + * Fix SCRAM authentication + * Fix BOSH connection with UTF-8 messages + * Fix smacks implementation + * Use uuid in stanza ids + python-nbxmpp 0.5.3 (13 July 2015) * Fix receiving long utf8 strings under py3 diff -r 721b7bf9b805 -r 88b9f384b07f nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sun Sep 04 13:50:08 2016 +0200 +++ b/nbxmpp/__init__.py Sun Sep 04 13:50:23 2016 +0200 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5.3" +__version__ = "0.5.4" diff -r 721b7bf9b805 -r 88b9f384b07f setup.py --- a/setup.py Sun Sep 04 13:50:08 2016 +0200 +++ b/setup.py Sun Sep 04 13:50:23 2016 +0200 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.3', + version='0.5.4', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

gajim: Accidentally went with camel case here on the filename. W...
by Gajim 02 Sep '16

02 Sep '16

changeset f5209cb10665 in /home/hg/repos/gajim author: Jeffrey Baitis <jeff(a)baitis.net> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f5209cb10665 description: Accidentally went with camel case here on the filename. Won't fail under windows, but will under *nix diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7414c5ecff7c -r f5209cb10665 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Sep 02 13:05:03 2016 -0700 +++ b/src/plugins/pluginmanager.py Fri Sep 02 13:38:56 2016 -0700 @@ -40,7 +40,7 @@ from plugins.helpers import log, log_calls, Singleton from plugins.helpers import GajimPluginActivateException -from plugins.GajimPlugin import GajimPlugin, GajimPluginException +from plugins.gajimplugin import GajimPlugin, GajimPluginException class PluginManager(metaclass=Singleton): '''

1 0

gajim-plugins: Add license and change authors
by Gajim Plugins 02 Sep '16

02 Sep '16

changeset 1b3448308794 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=1b3448308794 description: Add license and change authors diffstat: httpupload/httpupload.py | 16 +++++++++++++++- httpupload/manifest.ini | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diffs (35 lines): diff -r a40bef42a250 -r 1b3448308794 httpupload/httpupload.py --- a/httpupload/httpupload.py Sun Aug 28 23:26:56 2016 +0200 +++ b/httpupload/httpupload.py Fri Sep 02 22:40:47 2016 +0200 @@ -1,5 +1,19 @@ # -*- coding: utf-8 -*- -## +# +# 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/>. + from gi.repository import GObject, Gtk, GLib import os diff -r a40bef42a250 -r 1b3448308794 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Aug 28 23:26:56 2016 +0200 +++ b/httpupload/manifest.ini Fri Sep 02 22:40:47 2016 +0200 @@ -9,7 +9,6 @@ and maintains the scheme data: URI, a thumbnail image is send along the link to the full size image. If the receiving side doesn't support this, only a text message containing the link to the image is send. authors: Thilo Molitor <thilo(a)eightysoft.de> - Anders Sandblad <runeson(a)gmail.com> Philipp HÃ¶rist <philipp(a)hoerist.com> Linus Heckemann <linus(a)sphalerite.org> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin

1 0

gajim: Modified source to work under python3
by Gajim 02 Sep '16

02 Sep '16

changeset 7414c5ecff7c in /home/hg/repos/gajim author: Jeffrey Baitis <jeff(a)baitis.net> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7414c5ecff7c description: Modified source to work under python3 diffstat: plugins/dbus_plugin/__init__.py | 2 +- plugins/dbus_plugin/plugin.py | 8 +- plugins/events_dump/__init__.py | 2 +- plugins/events_dump/plugin.py | 9 +- plugins/new_events_example/__init__.py | 2 +- plugins/new_events_example/plugin.py | 2 +- plugins/roster_buttons/__init__.py | 2 +- src/history_manager.py | 3 + src/plugins/__init__.py | 2 +- src/plugins/gajimplugin.py | 283 +++++++++++++++++++++++++++++++++ src/plugins/plugin.py | 283 --------------------------------- src/plugins/pluginmanager.py | 2 +- 12 files changed, 301 insertions(+), 299 deletions(-) diffs (truncated from 707 to 300 lines): diff -r 978573139f4b -r 7414c5ecff7c plugins/dbus_plugin/__init__.py --- a/plugins/dbus_plugin/__init__.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/dbus_plugin/__init__.py Fri Sep 02 13:05:03 2016 -0700 @@ -1,1 +1,1 @@ -from plugin import DBusPlugin +from .plugin import DBusPlugin diff -r 978573139f4b -r 7414c5ecff7c plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/dbus_plugin/plugin.py Fri Sep 02 13:05:03 2016 -0700 @@ -34,7 +34,8 @@ :license: GPL ''' import os -import new +# import new # depricated in python3; use types instead +import types import gobject @@ -722,10 +723,9 @@ def _set_handling_methods(self): for event_name in self.events_names: setattr(self, event_name, - new.instancemethod( + types.MethodType( self._generate_handling_method(event_name), - self, - DBusPlugin)) + self)) self.events_handlers[event_name] = (ged.POSTCORE, getattr(self, event_name)) diff -r 978573139f4b -r 7414c5ecff7c plugins/events_dump/__init__.py --- a/plugins/events_dump/__init__.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/events_dump/__init__.py Fri Sep 02 13:05:03 2016 -0700 @@ -1,1 +1,1 @@ -from plugin import EventsDumpPlugin +from .plugin import EventsDumpPlugin diff -r 978573139f4b -r 7414c5ecff7c plugins/events_dump/plugin.py --- a/plugins/events_dump/plugin.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/events_dump/plugin.py Fri Sep 02 13:05:03 2016 -0700 @@ -25,7 +25,7 @@ :license: GPL ''' -import new +import types from pprint import pformat from plugins import GajimPlugin @@ -110,15 +110,14 @@ def _set_handling_methods(self): for event_name in self.events_names: setattr(self, event_name, - new.instancemethod( + types.MethodType( self._generate_handling_method(event_name), - self, - EventsDumpPlugin)) + self)) self.events_handlers[event_name] = (ged.POSTCORE, getattr(self, event_name)) def _generate_handling_method(self, event_name): def handler(self, *args): - print "Event '%s' occured. Arguments: %s\n\n===\n"%(event_name, pformat(args)) + print ("Event '%s' occured. Arguments: %s\n\n===\n" % (event_name, pformat(args))) return handler diff -r 978573139f4b -r 7414c5ecff7c plugins/new_events_example/__init__.py --- a/plugins/new_events_example/__init__.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/new_events_example/__init__.py Fri Sep 02 13:05:03 2016 -0700 @@ -1,1 +1,1 @@ -from plugin import NewEventsExamplePlugin +from .plugin import NewEventsExamplePlugin diff -r 978573139f4b -r 7414c5ecff7c plugins/new_events_example/plugin.py --- a/plugins/new_events_example/plugin.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/new_events_example/plugin.py Fri Sep 02 13:05:03 2016 -0700 @@ -26,7 +26,7 @@ :license: GPL ''' -import new +#import new # Depricated in python3 for types module from pprint import pformat from common import helpers diff -r 978573139f4b -r 7414c5ecff7c plugins/roster_buttons/__init__.py --- a/plugins/roster_buttons/__init__.py Sat Aug 20 00:35:57 2016 +0200 +++ b/plugins/roster_buttons/__init__.py Fri Sep 02 13:05:03 2016 -0700 @@ -1,4 +1,4 @@ __all__ = ['RosterButtonsPlugin'] -from plugin import RosterButtonsPlugin +from .plugin import RosterButtonsPlugin diff -r 978573139f4b -r 7414c5ecff7c src/history_manager.py --- a/src/history_manager.py Sat Aug 20 00:35:57 2016 +0200 +++ b/src/history_manager.py Fri Sep 02 13:05:03 2016 -0700 @@ -49,7 +49,10 @@ import sys import signal +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk +gi.require_version('GdkX11', '3.0') from gi.repository import Gdk from gi.repository import GLib import time diff -r 978573139f4b -r 7414c5ecff7c src/plugins/__init__.py --- a/src/plugins/__init__.py Sat Aug 20 00:35:57 2016 +0200 +++ b/src/plugins/__init__.py Fri Sep 02 13:05:03 2016 -0700 @@ -25,6 +25,6 @@ ''' from .pluginmanager import PluginManager -from .plugin import GajimPlugin +from .gajimplugin import GajimPlugin __all__ = ['PluginManager', 'GajimPlugin'] diff -r 978573139f4b -r 7414c5ecff7c src/plugins/gajimplugin.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/plugins/gajimplugin.py Fri Sep 02 13:05:03 2016 -0700 @@ -0,0 +1,283 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Base class for implementing plugin. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 1st June 2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import os +import locale + +from common import gajim + +from plugins.helpers import log_calls, log +from plugins.gui import GajimPluginConfigDialog + +import logging +log = logging.getLogger('gajim.p.plugin') + + +class GajimPlugin(object): + ''' + Base class for implementing Gajim plugins. + ''' + name = '' + ''' + Name of plugin. + + Will be shown in plugins management GUI. + + :type: str + ''' + short_name = '' + ''' + Short name of plugin. + + Used for quick indentification of plugin. + + :type: str + + :todo: decide whether we really need this one, because class name (with + module name) can act as such short name + ''' + version = '' + ''' + Version of plugin. + + :type: str + + :todo: decide how to compare version between each other (which one + is higher). Also rethink: do we really need to compare versions + of plugins between each other? This would be only useful if we detect + same plugin class but with different version and we want only the newest + one to be active - is such policy good? + ''' + description = '' + ''' + Plugin description. + + :type: str + + :todo: should be allow rich text here (like HTML or reStructuredText)? + ''' + authors = [] + ''' + Plugin authors. + + :type: [] of str + + :todo: should we decide on any particular format of author strings? + Especially: should we force format of giving author's e-mail? + ''' + homepage = '' + ''' + URL to plug-in's homepage. + + :type: str + + :todo: should we check whether provided string is valid URI? (Maybe + using 'property') + ''' + gui_extension_points = {} + ''' + Extension points that plugin wants to connect with and handlers to be used. + + Keys of this string should be strings with name of GUI extension point + to handles. Values should be 2-element tuples with references to handling + functions. First function will be used to connect plugin with extpoint, + the second one to successfuly disconnect from it. Connecting takes places + when plugin is activated and extpoint already exists, or when plugin is + already activated but extpoint is being created (eg. chat window opens). + Disconnecting takes place when plugin is deactivated and extpoint exists + or when extpoint is destroyed and plugin is activate (eg. chat window + closed). + ''' + config_default_values = {} + ''' + Default values for keys that should be stored in plug-in config. + + This dict is used when when someone calls for config option but it has not + been set yet. + + Values are tuples: (default_value, option_description). The first one can + be anything (this is the advantage of using shelve/pickle instead of + custom-made config I/O handling); the second one should be str (gettext + can be used if need and/or translation is planned). + + :type: {} of 2-element tuples + ''' + events_handlers = {} + ''' + Dictionary with events handlers. + + Keys are event names. Values should be 2-element tuples with handler + priority as first element and reference to handler function as second + element. Priority is integer. See `ged` module for predefined priorities + like `ged.PRECORE`, `ged.CORE` or `ged.POSTCORE`. + + :type: {} with 2-element tuples + ''' + events = [] + ''' + New network event classes to be registered in Network Events Controller. + + :type: [] of `nec.NetworkIncomingEvent` or `nec.NetworkOutgoingEvent` + subclasses. + ''' + + @log_calls('GajimPlugin') + def __init__(self): + self.config = GajimPluginConfig(self) + ''' + Plug-in configuration dictionary. + + Automatically saved and loaded and plug-in (un)load. + + :type: `plugins.plugin.GajimPluginConfig` + ''' + self.activatable = True + self.available_text = '' + self.load_config() + self.config_dialog = GajimPluginConfigDialog(self) + self.init() + + @log_calls('GajimPlugin') + def save_config(self): + self.config.save() + + @log_calls('GajimPlugin') + def load_config(self): + self.config.load() + + def __eq__(self, plugin): + if self.short_name == plugin.short_name: + return True + + return False

1 0

gajim-plugins: Add license and change authors
by Gajim Plugins 02 Sep '16

02 Sep '16

changeset 1938ce0462db in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=1938ce0462db description: Add license and change authors diffstat: httpupload/httpupload.py | 16 +++++++++++++++- httpupload/manifest.ini | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diffs (39 lines): diff -r f1e36838b049 -r 1938ce0462db httpupload/httpupload.py --- a/httpupload/httpupload.py Mon Aug 29 02:24:53 2016 +0200 +++ b/httpupload/httpupload.py Fri Sep 02 22:33:45 2016 +0200 @@ -1,9 +1,23 @@ # -*- coding: utf-8 -*- ## +## 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/>. +## from common import demandimport demandimport.enable() -demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] +demandimport.ignore += ['builtins', '__builtin__', 'PIL', '_imp'] import gtk import gobject diff -r f1e36838b049 -r 1938ce0462db httpupload/manifest.ini --- a/httpupload/manifest.ini Mon Aug 29 02:24:53 2016 +0200 +++ b/httpupload/manifest.ini Fri Sep 02 22:33:45 2016 +0200 @@ -9,7 +9,6 @@ and maintains the scheme data: URI, a thumbnail image is send along the link to the full size image. If the receiving side doesn't support this, only a text message containing the link to the image is send. authors: Thilo Molitor <thilo(a)eightysoft.de> - Anders Sandblad <runeson(a)gmail.com> Philipp HÃ¶rist <philipp(a)hoerist.com> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin min_gajim_version: 0.16.5

1 0

gajim: Use correct event var on gc-invitation
by Gajim 02 Sep '16

02 Sep '16

changeset 04723bd1dd57 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=04723bd1dd57 description: Use correct event var on gc-invitation diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c736e7a257be -r 04723bd1dd57 src/roster_window.py --- a/src/roster_window.py Fri Jun 24 20:12:37 2016 +0200 +++ b/src/roster_window.py Fri Sep 02 21:55:23 2016 +0200 @@ -2032,7 +2032,7 @@ return True elif event.type_ == 'gc-invitation': dialogs.InvitationReceivedDialog(account, event.room_jid, - event.jid_from, event.password, event.reason, + event.from_jid, event.password, event.reason, is_continued=event.is_continued) gajim.events.remove_events(account, jid, event) return True

1 0

gajim-plugins: Add own device id to the config window
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 089737a2ec09 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=089737a2ec09 description: Add own device id to the config window diffstat: omemo/config_dialog.ui | 44 +++++++++++++++++++++++++++++++++++++++++++- omemo/ui.py | 3 +++ 2 files changed, 46 insertions(+), 1 deletions(-) diffs (78 lines): diff -r d34e0424be2f -r 089737a2ec09 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Mon Aug 22 10:14:15 2016 +0200 +++ b/omemo/config_dialog.ui Mon Aug 22 11:18:54 2016 +0200 @@ -83,11 +83,12 @@ <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">5</property> <child> <object class="GtkLabel" id="fingerprint_label_desc"> + <property name="width_request">110</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="xalign">0</property> <property name="label" translatable="yes" comments="Descriptive label">Own Fingerprint:</property> <attributes> <attribute name="weight" value="bold"/> @@ -120,6 +121,47 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkLabel" id="OwnIDLabel"> + <property name="width_request">110</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Own Device ID:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="ID"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </object> </child> <child type="tab"> diff -r d34e0424be2f -r 089737a2ec09 omemo/ui.py --- a/omemo/ui.py Mon Aug 22 10:14:15 2016 +0200 +++ b/omemo/ui.py Mon Aug 22 11:18:54 2016 +0200 @@ -382,6 +382,9 @@ account = self.account_store[active][0] state = self.plugin.get_omemo_state(account) + deviceid = state.own_device_id + self.B.get_object('ID').set_markup('<tt>%s</tt>' % deviceid) + ownfpr = binascii.hexlify(state.store.getIdentityKeyPair() .getPublicKey().serialize()) ownfpr = self.human_hash(ownfpr[2:])

1 0

gajim-plugins: Fix version check
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 8812bbe6cde1 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=8812bbe6cde1 description: Fix version check diffstat: omemo/__init__.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 089737a2ec09 -r 8812bbe6cde1 omemo/__init__.py --- a/omemo/__init__.py Mon Aug 22 11:18:54 2016 +0200 +++ b/omemo/__init__.py Tue Aug 23 00:54:13 2016 +0200 @@ -70,13 +70,12 @@ try: import axolotl - if axolotl.__version__ < "0.1.35": - ERROR_MSG = AXOLOTL_MISSING except Exception as e: log.error(e) ERROR_MSG = AXOLOTL_MISSING -if gajim.config.get('version') < "0.16.5": +ver = gajim.config.get('version') +if ver[0:6] != '0.16.5': ERROR_MSG = GAJIM_VERSION # pylint: disable=no-init

1 0

gajim-plugins: Better version check
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 7f16cbf197bd in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=7f16cbf197bd description: Better version check diffstat: omemo/__init__.py | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diffs (35 lines): diff -r 8812bbe6cde1 -r 7f16cbf197bd omemo/__init__.py --- a/omemo/__init__.py Tue Aug 23 00:54:13 2016 +0200 +++ b/omemo/__init__.py Tue Aug 23 01:05:47 2016 +0200 @@ -21,6 +21,7 @@ import logging import os import sqlite3 +import os from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS @@ -74,9 +75,20 @@ log.error(e) ERROR_MSG = AXOLOTL_MISSING -ver = gajim.config.get('version') -if ver[0:6] != '0.16.5': - ERROR_MSG = GAJIM_VERSION +GAJIM_VER = gajim.config.get('version') + +if os.name != 'nt': + try: + SETUPTOOLS_MISSING = False + from pkg_resources import parse_version + except Exception as e: + log.error(e) + SETUPTOOLS_MISSING = True + ERROR_MSG = 'You are missing the Setuptools package.' + + if not SETUPTOOLS_MISSING: + if parse_version(GAJIM_VER) < parse_version('0.16.5'): + ERROR_MSG = GAJIM_VERSION # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init

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