Yann Leboulanger pushed to branch master at gajim / gajim
Commits: 0eec41ee by Emmanuel Gil Peyrot at 2017-01-03T21:14:27+00:00 Simplify nbxmpp import error checking to exit(1).
There was no reason for distutils’ version support to fail.
- - - - - 5173a2d1 by Yann Leboulanger at 2017-01-03T22:20:14+01:00 Merge branch 'no-nbxmpp' into 'master'
Simplify nbxmpp import error checking
See merge request !17 - - - - -
1 changed file:
- src/gajim.py
Changes:
===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -51,28 +51,18 @@ if os.name == 'nt':
warnings.filterwarnings(action='ignore')
-HAS_NBXMPP=True MIN_NBXMPP_VER = "0.5.3" from gi.repository import GLib try: import nbxmpp except ImportError: - HAS_NBXMPP=False - -if not HAS_NBXMPP: print('Gajim needs python-nbxmpp to run. Quiting...') - sys.exit() + sys.exit(1)
-try: - from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): - HAS_NBXMPP=False -except: - HAS_NBXMPP=False - -if not HAS_NBXMPP: +from distutils.version import LooseVersion as V +if V(nbxmpp.__version__) < V(MIN_NBXMPP_VER): print('Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER) - sys.exit() + sys.exit(1)
if os.name == 'nt': import locale
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/430c4b1536200ec5252f3d9351e195a2b0...