Skip to content

Commit 1e54c59

Browse files
committed
fix: run on systems with newer setuptools
- Don't use pkg_resources.packaging if installed version of setuptools doesn't support it
1 parent 3419758 commit 1e54c59

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

mamonsu/plugins/pgsql/driver/pg8000/core.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
from collections import defaultdict, deque
33
from datetime import datetime as Datetime
44
from decimal import Decimal
5-
from pkg_resources import packaging
65
from hashlib import md5
76
from itertools import count, islice
87
from struct import Struct
98
from warnings import warn
109

10+
try:
11+
from pkg_resources import packaging
12+
except ImportError:
13+
import packaging.version
14+
1115
from mamonsu.plugins.pgsql.driver.pg8000 import converters
1216
from .exceptions import (
1317
ArrayContentNotSupportedError, DatabaseError, Error, IntegrityError,

mamonsu/plugins/pgsql/driver/pool.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
from pkg_resources import packaging
21
from .connection import Connection, ConnectionInfo
32

3+
try:
4+
from pkg_resources import packaging
5+
except ImportError:
6+
import packaging.version
47

58
class Pool(object):
69
ExcludeDBs = ["template0", "template1"]

mamonsu/plugins/pgsql/memory_leak_diagnostic.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
import os
55
from .pool import Pooler
66
import re
7-
from pkg_resources import packaging
87
import mamonsu.lib.platform as platform
98
import posix
109

10+
try:
11+
from pkg_resources import packaging
12+
except ImportError:
13+
import packaging.version
1114

1215
class MemoryLeakDiagnostic(Plugin):
1316
DEFAULT_CONFIG = {

mamonsu/plugins/pgsql/replication.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# -*- coding: utf-8 -*-
22

33
from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
4-
from pkg_resources import packaging
54
from .pool import Pooler
65
from mamonsu.lib.zbx_template import ZbxTemplate
76

7+
try:
8+
from pkg_resources import packaging
9+
except ImportError:
10+
import packaging.version
11+
812
NUMBER_NON_ACTIVE_SLOTS = 0
913

1014

0 commit comments

Comments
 (0)