From 205bd33d3d63cd32d5fa7cc3d326b462a7a25857 Mon Sep 17 00:00:00 2001 From: http Date: Thu, 2 Mar 2017 11:11:11 +0300 Subject: [PATCH] fix bug --- agent/mod_mikrotik.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 43f25df..e1279d3 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -7,6 +7,7 @@ from mydefs import ping from .structs import TariffStruct, AbonStruct, IpStruct, ShapeItem from . import settings from djing.settings import DEBUG +import re class ApiRos: @@ -171,7 +172,8 @@ class MikrotikTransmitter(BaseTransmitter): def _build_shape_obj(self, info): try: speeds = info['=max-limit'].split('/') - speeds = [sp.replace('M','') for sp in speeds] + speeds = [re.sub(r'[a-zA-Z]', '', sp) for sp in speeds] + #FIXBUG: не может распознать входные данные на скорость 62k, надо фильтровать буквы в скоростях t = TariffStruct(speedIn=speeds[0], speedOut=speeds[1]) a = AbonStruct( uid=int(info['=name'][3:]),