From e0a84d89f179da0946a8827a3ce529557f2ee0d1 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Sun, 12 Aug 2012 23:15:45 +0400 Subject: [PATCH] ubuntu_integration. fix detecting 'python-xdg' module --- ubuntu_integration/plugin.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ubuntu_integration/plugin.py b/ubuntu_integration/plugin.py index 2fec0e4..2298ba8 100644 --- a/ubuntu_integration/plugin.py +++ b/ubuntu_integration/plugin.py @@ -31,11 +31,6 @@ try: HAS_INDICATE = True except ImportError: HAS_INDICATE = False -try: - from xdg.BaseDirectory import load_data_paths - HAS_PYXDG = True -except ImportError: - HAS_PYXDG = False class UbuntuIntegrationPlugin(GajimPlugin): @@ -64,10 +59,13 @@ class UbuntuIntegrationPlugin(GajimPlugin): # {(account, jid): (indicator, [event, ...]), ...} self.events = {} + try: + from xdg.BaseDirectory import load_data_paths + except ImportError: + raise GajimPluginException("python-xdg is missing!") + if not HAS_INDICATE: raise GajimPluginException("python-indicate is missing!") - if not HAS_PYXDG: - raise GajimPluginException("python-xdg is missing!") self.server = indicate.indicate_server_ref_default() self.server.set_type("message.im")