8000 fix: run zabbix cli tools with newer setuptools · postgrespro/mamonsu@ea9ceb4 · GitHub
[go: up one dir, main page]
Skip to content

Commit ea9ceb4

Browse files
mstyushinmstyushin
committed
fix: run zabbix cli tools with newer setuptools
1 parent 775d8aa commit ea9ceb4

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

‎mamonsu/tools/zabbix_cli/operations.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
import json
66
from mamonsu.tools.zabbix_cli.request import Request
77
from mamonsu.lib.parser import zabbix_msg
8-
from pkg_resources import packaging
8+
9+
try:
10+
from pkg_resources import packaging
11+
except ImportError:
12+
import packaging.version
13+
914
from mamonsu.tools.zabbix_cli.dashboard import generate_dashboard
1015

1116

‎mamonsu/tools/zabbix_cli/request.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
import logging
55
from collections import OrderedDict
66

7+
try:
8+
from pkg_resources import packaging
9+
except ImportError:
10+
import packaging.version
711

8-
from pkg_resources import packaging
912
import urllib.request as urllib2
1013

1114

0 commit comments

Comments
 (0)
0