copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'no-nbxmpp' into 'master' 

Simplify nbxmpp import error checking

See merge request !17
This commit is contained in:
Yann Leboulanger 2017-01-03 22:20:14 +01:00
parent 430c4b1536 0eec41ee89
commit 5173a2d112
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gajim.py
View File

@ -51,28 +51,18 @@ if os.name == 'nt':
warnings.filterwarnings(action='ignore') warnings.filterwarnings(action='ignore')
HAS_NBXMPP=True
MIN_NBXMPP_VER = "0.5.3" MIN_NBXMPP_VER = "0.5.3"
from gi.repository import GLib from gi.repository import GLib
try: try:
import nbxmpp import nbxmpp
except ImportError: except ImportError:
HAS_NBXMPP=False
if not HAS_NBXMPP:
print('Gajim needs python-nbxmpp to run. Quiting...') print('Gajim needs python-nbxmpp to run. Quiting...')
sys.exit() sys.exit(1)
try:
from distutils.version import LooseVersion as V from distutils.version import LooseVersion as V
if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER):
HAS_NBXMPP=False
except:
HAS_NBXMPP=False
if not HAS_NBXMPP:
print('Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER) print('Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER)
sys.exit() sys.exit(1)
if os.name == 'nt': if os.name == 'nt':
import locale import locale