From a711f346fbf19de3d59b930ecc0d4f9a2b196f8e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 10 Feb 2025 17:49:07 +0100
Subject: [PATCH 1/2] don't use 'six'

---
 .../tools/pyblish_pype/vendor/qtawesome/iconic_font.py         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/ayon_core/tools/pyblish_pype/vendor/qtawesome/iconic_font.py b/client/ayon_core/tools/pyblish_pype/vendor/qtawesome/iconic_font.py
index c25739aff8..ce95f9e74f 100644
--- a/client/ayon_core/tools/pyblish_pype/vendor/qtawesome/iconic_font.py
+++ b/client/ayon_core/tools/pyblish_pype/vendor/qtawesome/iconic_font.py
@@ -5,7 +5,6 @@
 import json
 import os
 
-import six
 from qtpy import QtCore, QtGui
 
 
@@ -152,7 +151,7 @@ def load_font(self,
         def hook(obj):
             result = {}
             for key in obj:
-                result[key] = six.unichr(int(obj[key], 16))
+                result[key] = chr(int(obj[key], 16))
             return result
 
         if directory is None:

From ac54c441ecf2d28892e3bd115598bbda459dace8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 10 Feb 2025 19:01:24 +0100
Subject: [PATCH 2/2] remove six from pyblish pype

---
 client/ayon_core/tools/pyblish_pype/model.py | 5 ++---
 client/ayon_core/tools/pyblish_pype/util.py  | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/tools/pyblish_pype/model.py b/client/ayon_core/tools/pyblish_pype/model.py
index 3a402f386e..44f951fe14 100644
--- a/client/ayon_core/tools/pyblish_pype/model.py
+++ b/client/ayon_core/tools/pyblish_pype/model.py
@@ -31,7 +31,6 @@
 from .awesome import tags as awesome
 from qtpy import QtCore, QtGui
 import qtawesome
-from six import text_type
 from .constants import PluginStates, InstanceStates, GroupStates, Roles
 
 
@@ -985,7 +984,7 @@ def prepare_records(self, result, suspend_logs):
                     record_item = record
                 else:
                     record_item = {
-                        "label": text_type(record.msg),
+                        "label": str(record.msg),
                         "type": "record",
                         "levelno": record.levelno,
                         "threadName": record.threadName,
@@ -993,7 +992,7 @@ def prepare_records(self, result, suspend_logs):
                         "filename": record.filename,
                         "pathname": record.pathname,
                         "lineno": record.lineno,
-                        "msg": text_type(record.msg),
+                        "msg": str(record.msg),
                         "msecs": record.msecs,
                         "levelname": record.levelname
                     }
diff --git a/client/ayon_core/tools/pyblish_pype/util.py b/client/ayon_core/tools/pyblish_pype/util.py
index d24b07a409..081f7775d5 100644
--- a/client/ayon_core/tools/pyblish_pype/util.py
+++ b/client/ayon_core/tools/pyblish_pype/util.py
@@ -10,7 +10,6 @@
 import collections
 
 from qtpy import QtCore
-from six import text_type
 import pyblish.api
 
 root = os.path.dirname(__file__)
@@ -64,7 +63,7 @@ def u_print(msg, **kwargs):
         **kwargs: Keyword argument for `print` function.
     """
 
-    if isinstance(msg, text_type):
+    if isinstance(msg, str):
         encoding = None
         try:
             encoding = os.getenv('PYTHONIOENCODING', sys.stdout.encoding)