Skip to content

Commit 2fc30bc

Browse files
committed
chore: removed python2 libraries support completely
1 parent 97f082b commit 2fc30bc

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

mamonsu/lib/senders/zbx.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import socket
88
import json
99
import logging
10-
import encodings.idna
1110

12-
import mamonsu.lib.platform as platform
1311
from mamonsu.lib.plugin import Plugin
1412
from mamonsu.lib.queue import Queue
1513
from itertools import islice
@@ -102,10 +100,7 @@ def send_file_to_zabbix(self, path):
102100

103101
def _send_data(self, data):
104102
data_len = struct.pack('<Q', len(data))
105-
if platform.PY3:
106-
packet = b'ZBXD\x01' + data_len + str.encode(data)
107-
else:
108-
packet = 'ZBXD\x01' + data_len + data
103+
packet = b'ZBXD\x01' + data_len + str.encode(data)
109104
try:
110105
sock = socket.socket()
111106
sock.connect((self.host, self.port))

mamonsu/tools/report/start.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# -*- coding: utf-8 -*-
22

33
from __future__ import print_function
4-
import sys
54
import logging
65
import optparse
76
import os
@@ -21,12 +20,6 @@
2120
if platform.LINUX:
2221
import pwd
2322

24-
from mamonsu.tools.report.format import TermColor
25-
26-
if platform.PY2:
27-
reload(sys)
28-
sys.setdefaultencoding('utf-8')
29-
3023

3124
class Args(DefaultConfig):
3225

0 commit comments

Comments
 (0)