From 331adaf820c3f9c37457be667bd1fc775802cb99 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 10 Jun 2020 00:40:22 +0200 Subject: [PATCH] fixup * update version regex to succesfully match only the version string + add missing import --- api.py | 6 +++--- influx.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api.py b/api.py index 82ac3e7..a83bae7 100644 --- a/api.py +++ b/api.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import logging import re from packaging import version -import logging class EjabberdApi: """ @@ -32,12 +32,12 @@ class EjabberdApi: @property def verstring(self): if self._login is not None: - ver_str = re.compile('([1-9][0-9.]+)') + ver_str = re.compile('([1-9][0-9.]+(?![.a-z]))\\b') status = self.cmd('status', {}) # matches try: - tmp = ver_str.findall(status)[1] + tmp = ver_str.findall(status)[0] # raise SystemExit code 17 if no status message is received except TypeError: raise SystemExit(17) diff --git a/influx.py b/influx.py index 979176a..2a0dcf5 100644 --- a/influx.py +++ b/influx.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import logging import time from influxdb import InfluxDBClient