From 29e1e8e80f95c3cb9f566bb4cd026a150f3ade5b Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Thu, 8 Oct 2026 11:23:22 +0300 Subject: [PATCH] package six is not used now (bye) --- pyproject.toml | 1 - src/exceptions.py | 5 ++--- tests/requirements.txt | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index df69dd8..8dec048 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,6 @@ classifiers = [ dependencies = [ "psutil", - "six>=1.9.0", "testgres.common>=1.0.1,<2.0.0", ] diff --git a/src/exceptions.py b/src/exceptions.py index d6743d2..2e08f83 100644 --- a/src/exceptions.py +++ b/src/exceptions.py @@ -6,7 +6,6 @@ from testgres.common.exceptions import TestgresException from testgres.common.exceptions import InvalidOperationException -import six import typing @@ -126,12 +125,12 @@ def __repr__(self) -> str: def convert_and_join(msg_list): # Convert each byte element in the list to str str_list = [ - six.text_type(item, 'utf-8') if isinstance(item, bytes) else six.text_type(item) + item.decode('utf-8') if isinstance(item, bytes) else str(item) for item in msg_list ] # Join the list into a single string with the specified delimiter - return six.text_type('\n').join(str_list) + return '\n'.join(str_list) class ExecTimeoutException(TestgresException): diff --git a/tests/requirements.txt b/tests/requirements.txt index a2acb51..3c17779 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,5 +2,4 @@ pytest pytest-env pytest-xdist psutil -six testgres.common>=1.0.1,<2.0.0