From e94ff6eab5715da40f3c59824b98229247e49efb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 May 2026 12:53:57 +0000 Subject: [PATCH 1/4] Drop usages of six --- transifex/api/jsonapi/apis.py | 4 +--- transifex/api/jsonapi/utils.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/transifex/api/jsonapi/apis.py b/transifex/api/jsonapi/apis.py index 23c929d..3134f73 100644 --- a/transifex/api/jsonapi/apis.py +++ b/transifex/api/jsonapi/apis.py @@ -3,8 +3,6 @@ from copy import deepcopy import requests -import six - from .auth import BearerAuthentication from .compat import JSONDecodeError from .exceptions import JsonApiException @@ -60,7 +58,7 @@ def __new__(cls, *args, **kwargs): return result -class JsonApi(six.with_metaclass(_JsonApiMetaclass, object)): +class JsonApi(object, metaclass=_JsonApiMetaclass): """Inteface for a new {json:api} API connection. Initialization parameters: diff --git a/transifex/api/jsonapi/utils.py b/transifex/api/jsonapi/utils.py index eab7075..7d08ddf 100644 --- a/transifex/api/jsonapi/utils.py +++ b/transifex/api/jsonapi/utils.py @@ -1,7 +1,5 @@ from __future__ import absolute_import, unicode_literals -import six - from .compat import abc @@ -22,7 +20,7 @@ def is_dict(value): def is_list(value): - return isinstance(value, abc.Sequence) and not isinstance(value, six.string_types) + return isinstance(value, abc.Sequence) and not isinstance(value, str) def is_null(value): From 8defdc12d6803ce330eedc896005ee21901a9087 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 May 2026 12:56:14 +0000 Subject: [PATCH 2/4] Drop six and Python 2 compat imports in jsonapi apis/utils --- transifex/api/jsonapi/apis.py | 2 -- transifex/api/jsonapi/utils.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/transifex/api/jsonapi/apis.py b/transifex/api/jsonapi/apis.py index 3134f73..d637d49 100644 --- a/transifex/api/jsonapi/apis.py +++ b/transifex/api/jsonapi/apis.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from copy import deepcopy import requests diff --git a/transifex/api/jsonapi/utils.py b/transifex/api/jsonapi/utils.py index 7d08ddf..eea9cda 100644 --- a/transifex/api/jsonapi/utils.py +++ b/transifex/api/jsonapi/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from .compat import abc From f8130c830f07618f1ea33b0caf485292ebcdd9d8 Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Thu, 28 May 2026 12:24:34 +0200 Subject: [PATCH 3/4] Refactor JsonApi class definition Removed redundant 'object' inheritance from JsonApi class. --- transifex/api/jsonapi/apis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transifex/api/jsonapi/apis.py b/transifex/api/jsonapi/apis.py index d637d49..079c53f 100644 --- a/transifex/api/jsonapi/apis.py +++ b/transifex/api/jsonapi/apis.py @@ -56,7 +56,7 @@ def __new__(cls, *args, **kwargs): return result -class JsonApi(object, metaclass=_JsonApiMetaclass): +class JsonApi(metaclass=_JsonApiMetaclass): """Inteface for a new {json:api} API connection. Initialization parameters: From 361da8c5db7d1005562bb802ca4343499082dc96 Mon Sep 17 00:00:00 2001 From: Maciej Olko Date: Thu, 28 May 2026 12:26:37 +0200 Subject: [PATCH 4/4] Import abc from collections instead of compat --- transifex/api/jsonapi/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transifex/api/jsonapi/utils.py b/transifex/api/jsonapi/utils.py index eea9cda..b6ffe17 100644 --- a/transifex/api/jsonapi/utils.py +++ b/transifex/api/jsonapi/utils.py @@ -1,4 +1,4 @@ -from .compat import abc +from collections import abc def is_resource(value):