Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ classifiers = [

dependencies = [
"psutil",
"six>=1.9.0",
"testgres.common>=1.0.1,<2.0.0",
]

Expand Down
5 changes: 2 additions & 3 deletions src/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from testgres.common.exceptions import TestgresException
from testgres.common.exceptions import InvalidOperationException

import six
import typing


Expand Down Expand Up @@ -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):
Expand Down
1 change: 0 additions & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ pytest
pytest-env
pytest-xdist
psutil
six
testgres.common>=1.0.1,<2.0.0
Loading