From e5efaf842b08a3793a660987a7a744d3888b0020 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 25 Nov 2021 00:39:22 +0100
Subject: [PATCH 1/2] removed imports from avalon vendor and use sys modules

---
 openpype/hosts/aftereffects/api/__init__.py      |  8 ++++----
 .../aftereffects/plugins/create/create_render.py |  6 +++---
 openpype/hosts/fusion/api/lib.py                 |  2 +-
 .../fusion/plugins/inventory/set_tool_color.py   |  2 +-
 openpype/hosts/fusion/scripts/set_rendermode.py  |  2 +-
 .../hosts/fusion/utility_scripts/switch_ui.py    |  3 ++-
 openpype/hosts/hiero/api/lib.py                  |  4 ++--
 openpype/hosts/maya/api/__init__.py              |  2 +-
 openpype/hosts/maya/api/lib.py                   |  8 ++++----
 openpype/hosts/maya/plugins/load/actions.py      |  2 +-
 .../maya/plugins/publish/collect_yeti_rig.py     |  2 +-
 .../maya/plugins/publish/submit_maya_muster.py   |  5 +++--
 .../publish/validate_assembly_transforms.py      |  2 +-
 .../publish/validate_muster_connection.py        |  3 ++-
 openpype/hosts/photoshop/api/__init__.py         |  9 +++++----
 .../photoshop/plugins/create/create_image.py     | 16 ++++++++--------
 .../publish/submit_houdini_remote_publish.py     |  2 +-
 .../publish/submit_houdini_render_deadline.py    |  2 +-
 .../plugins/publish/submit_nuke_deadline.py      |  5 +++--
 .../plugins/publish/submit_publish_job.py        |  3 ++-
 .../publish/validate_deadline_connection.py      |  6 +++---
 .../validate_expected_and_rendered_files.py      |  4 ++--
 .../publish/collect_sequences_from_job.py        |  2 +-
 openpype/plugins/load/copy_file.py               |  2 +-
 openpype/plugins/load/copy_file_path.py          |  2 +-
 openpype/plugins/load/delete_old_versions.py     |  2 +-
 openpype/plugins/load/open_djv.py                |  2 +-
 openpype/plugins/load/open_file.py               |  2 +-
 openpype/tools/assetcreator/model.py             |  3 +--
 openpype/widgets/message_window.py               |  2 +-
 openpype/widgets/popup.py                        |  2 +-
 openpype/widgets/project_settings.py             |  5 ++---
 32 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/__init__.py b/openpype/hosts/aftereffects/api/__init__.py
index 5f6a64a6d03..b1edb91a5ca 100644
--- a/openpype/hosts/aftereffects/api/__init__.py
+++ b/openpype/hosts/aftereffects/api/__init__.py
@@ -4,7 +4,7 @@
 
 from avalon import io
 from avalon import api as avalon
-from avalon.vendor import Qt
+from Qt import QtWidgets
 from openpype import lib, api
 import pyblish.api as pyblish
 import openpype.hosts.aftereffects
@@ -41,10 +41,10 @@ def check_inventory():
 
     # Warn about outdated containers.
     print("Starting new QApplication..")
-    app = Qt.QtWidgets.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    message_box = Qt.QtWidgets.QMessageBox()
-    message_box.setIcon(Qt.QtWidgets.QMessageBox.Warning)
+    message_box = QtWidgets.QMessageBox()
+    message_box.setIcon(QtWidgets.QMessageBox.Warning)
     msg = "There are outdated containers in the scene."
     message_box.setText(msg)
     message_box.exec_()
diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index 4234ee0f0c4..b796e9eaac0 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -1,5 +1,5 @@
 import openpype.api
-from avalon.vendor import Qt
+from Qt import QtWidgets
 from avalon import aftereffects
 
 import logging
@@ -56,7 +56,7 @@ def process(self):
         stub.rename_item(item.id, stub.PUBLISH_ICON + self.data["subset"])
 
     def _show_msg(self, txt):
-        msg = Qt.QtWidgets.QMessageBox()
-        msg.setIcon(Qt.QtWidgets.QMessageBox.Warning)
+        msg = QtWidgets.QMessageBox()
+        msg.setIcon(QtWidgets.QMessageBox.Warning)
         msg.setText(txt)
         msg.exec_()
diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py
index 77866fde9d7..7afcdd82ea5 100644
--- a/openpype/hosts/fusion/api/lib.py
+++ b/openpype/hosts/fusion/api/lib.py
@@ -1,6 +1,6 @@
 import sys
 
-from avalon.vendor.Qt import QtGui
+from Qt import QtGui
 import avalon.fusion
 from avalon import io
 
diff --git a/openpype/hosts/fusion/plugins/inventory/set_tool_color.py b/openpype/hosts/fusion/plugins/inventory/set_tool_color.py
index 940a0e99419..9fc7012db7c 100644
--- a/openpype/hosts/fusion/plugins/inventory/set_tool_color.py
+++ b/openpype/hosts/fusion/plugins/inventory/set_tool_color.py
@@ -1,5 +1,5 @@
 from avalon import api, style
-from avalon.vendor.Qt import QtGui, QtWidgets
+from Qt import QtGui, QtWidgets
 
 import avalon.fusion
 
diff --git a/openpype/hosts/fusion/scripts/set_rendermode.py b/openpype/hosts/fusion/scripts/set_rendermode.py
index cb104445a89..73eec528a2e 100644
--- a/openpype/hosts/fusion/scripts/set_rendermode.py
+++ b/openpype/hosts/fusion/scripts/set_rendermode.py
@@ -1,4 +1,4 @@
-from avalon.vendor.Qt import QtWidgets
+from Qt import QtWidgets
 from avalon.vendor import qtawesome
 import avalon.fusion as avalon
 
diff --git a/openpype/hosts/fusion/utility_scripts/switch_ui.py b/openpype/hosts/fusion/utility_scripts/switch_ui.py
index e0b6b3f882f..2be91af32af 100644
--- a/openpype/hosts/fusion/utility_scripts/switch_ui.py
+++ b/openpype/hosts/fusion/utility_scripts/switch_ui.py
@@ -2,12 +2,13 @@
 import glob
 import logging
 
+from Qt import QtWidgets, QtCore
+
 import avalon.io as io
 import avalon.api as api
 import avalon.pipeline as pipeline
 import avalon.fusion
 import avalon.style as style
-from avalon.vendor.Qt import QtWidgets, QtCore
 from avalon.vendor import qtawesome as qta
 
 
diff --git a/openpype/hosts/hiero/api/lib.py b/openpype/hosts/hiero/api/lib.py
index af58f5b73e4..21b65e5c96a 100644
--- a/openpype/hosts/hiero/api/lib.py
+++ b/openpype/hosts/hiero/api/lib.py
@@ -5,13 +5,13 @@
 import re
 import sys
 import ast
+import shutil
 import hiero
+from Qt import QtWidgets
 import avalon.api as avalon
 import avalon.io
-from avalon.vendor.Qt import QtWidgets
 from openpype.api import (Logger, Anatomy, get_anatomy_settings)
 from . import tags
-import shutil
 from compiler.ast import flatten
 
 try:
diff --git a/openpype/hosts/maya/api/__init__.py b/openpype/hosts/maya/api/__init__.py
index e330904abf0..b25fd44217b 100644
--- a/openpype/hosts/maya/api/__init__.py
+++ b/openpype/hosts/maya/api/__init__.py
@@ -138,7 +138,7 @@ def on_save(_):
 def on_open(_):
     """On scene open let's assume the containers have changed."""
 
-    from avalon.vendor.Qt import QtWidgets
+    from Qt import QtWidgets
     from openpype.widgets import popup
 
     cmds.evalDeferred(
diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 4074aa7fa88..52ebcaff649 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -6,19 +6,19 @@
 import uuid
 import math
 
-import bson
 import json
 import logging
 import itertools
 import contextlib
 from collections import OrderedDict, defaultdict
 from math import ceil
+from six import string_types
+import bson
 
 from maya import cmds, mel
 import maya.api.OpenMaya as om
 
 from avalon import api, maya, io, pipeline
-from avalon.vendor.six import string_types
 import avalon.maya.lib
 import avalon.maya.interactive
 
@@ -1936,7 +1936,7 @@ def validate_fps():
 
     if current_fps != fps:
 
-        from avalon.vendor.Qt import QtWidgets
+        from Qt import QtWidgets
         from ...widgets import popup
 
         # Find maya main window
@@ -2694,7 +2694,7 @@ def update_content_on_context_change():
 
 
 def show_message(title, msg):
-    from avalon.vendor.Qt import QtWidgets
+    from Qt import QtWidgets
     from openpype.widgets import message_window
 
     # Find maya main window
diff --git a/openpype/hosts/maya/plugins/load/actions.py b/openpype/hosts/maya/plugins/load/actions.py
index d4525511f47..1a9adf61427 100644
--- a/openpype/hosts/maya/plugins/load/actions.py
+++ b/openpype/hosts/maya/plugins/load/actions.py
@@ -133,7 +133,7 @@ def display_warning(self):
 
         """
 
-        from avalon.vendor.Qt import QtWidgets
+        from Qt import QtWidgets
 
         accept = QtWidgets.QMessageBox.Ok
         buttons = accept | QtWidgets.QMessageBox.Cancel
diff --git a/openpype/hosts/maya/plugins/publish/collect_yeti_rig.py b/openpype/hosts/maya/plugins/publish/collect_yeti_rig.py
index 0d240b1a328..029432223be 100644
--- a/openpype/hosts/maya/plugins/publish/collect_yeti_rig.py
+++ b/openpype/hosts/maya/plugins/publish/collect_yeti_rig.py
@@ -275,7 +275,7 @@ def get_sequence(self, filepath, pattern="%04d"):
             list: file sequence.
 
         """
-        from avalon.vendor import clique
+        import clique
 
         escaped = re.escape(filepath)
         re_pattern = escaped.replace(pattern, "-?[0-9]+")
diff --git a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
index 207cf56cfe7..ac3de4114cd 100644
--- a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
+++ b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
@@ -1,13 +1,14 @@
 import os
 import json
 import getpass
-import appdirs
 import platform
 
+import appdirs
+import requests
+
 from maya import cmds
 
 from avalon import api
-from avalon.vendor import requests
 
 import pyblish.api
 from openpype.hosts.maya.api import lib
diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
index 00600a6f62f..dca59b147b0 100644
--- a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
+++ b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
@@ -89,8 +89,8 @@ def repair(cls, instance):
 
         """
 
+        from Qt import QtWidgets
         from openpype.hosts.maya.api import lib
-        from avalon.vendor.Qt import QtWidgets
 
         # Store namespace in variable, cosmetics thingy
         messagebox = QtWidgets.QMessageBox
diff --git a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
index 1a7ee112307..af32c82f972 100644
--- a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
+++ b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
@@ -1,9 +1,10 @@
 import os
 import json
+
 import appdirs
+import requests
 
 import pyblish.api
-from avalon.vendor import requests
 from openpype.plugin import contextplugin_should_run
 import openpype.hosts.maya.api.action
 
diff --git a/openpype/hosts/photoshop/api/__init__.py b/openpype/hosts/photoshop/api/__init__.py
index 81942c3b2a5..d978d6ecc18 100644
--- a/openpype/hosts/photoshop/api/__init__.py
+++ b/openpype/hosts/photoshop/api/__init__.py
@@ -2,9 +2,10 @@
 import sys
 import logging
 
+from Qt import QtWidgets
+
 from avalon import io
 from avalon import api as avalon
-from avalon.vendor import Qt
 from openpype import lib
 from pyblish import api as pyblish
 import openpype.hosts.photoshop
@@ -38,10 +39,10 @@ def check_inventory():
 
     # Warn about outdated containers.
     print("Starting new QApplication..")
-    app = Qt.QtWidgets.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
-    message_box = Qt.QtWidgets.QMessageBox()
-    message_box.setIcon(Qt.QtWidgets.QMessageBox.Warning)
+    message_box = QtWidgets.QMessageBox()
+    message_box.setIcon(QtWidgets.QMessageBox.Warning)
     msg = "There are outdated containers in the scene."
     message_box.setText(msg)
     message_box.exec_()
diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py
index 967a704ccfc..657d41aa93f 100644
--- a/openpype/hosts/photoshop/plugins/create/create_image.py
+++ b/openpype/hosts/photoshop/plugins/create/create_image.py
@@ -1,5 +1,5 @@
+from Qt import QtWidgets
 import openpype.api
-from avalon.vendor import Qt
 from avalon import photoshop
 
 
@@ -26,21 +26,21 @@ def process(self):
             if len(selection) > 1:
                 # Ask user whether to create one image or image per selected
                 # item.
-                msg_box = Qt.QtWidgets.QMessageBox()
-                msg_box.setIcon(Qt.QtWidgets.QMessageBox.Warning)
+                msg_box = QtWidgets.QMessageBox()
+                msg_box.setIcon(QtWidgets.QMessageBox.Warning)
                 msg_box.setText(
                     "Multiple layers selected."
                     "\nDo you want to make one image per layer?"
                 )
                 msg_box.setStandardButtons(
-                    Qt.QtWidgets.QMessageBox.Yes |
-                    Qt.QtWidgets.QMessageBox.No |
-                    Qt.QtWidgets.QMessageBox.Cancel
+                    QtWidgets.QMessageBox.Yes |
+                    QtWidgets.QMessageBox.No |
+                    QtWidgets.QMessageBox.Cancel
                 )
                 ret = msg_box.exec_()
-                if ret == Qt.QtWidgets.QMessageBox.Yes:
+                if ret == QtWidgets.QMessageBox.Yes:
                     multiple_instances = True
-                elif ret == Qt.QtWidgets.QMessageBox.Cancel:
+                elif ret == QtWidgets.QMessageBox.Cancel:
                     return
 
                 if multiple_instances:
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py
index 9ada437716c..c3228bfe523 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_remote_publish.py
@@ -1,10 +1,10 @@
 import os
 import json
 
+import requests
 import hou
 
 from avalon import api, io
-from avalon.vendor import requests
 
 import pyblish.api
 
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index f471d788b66..fa146c0d30b 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -2,8 +2,8 @@
 import json
 import getpass
 
+import requests
 from avalon import api
-from avalon.vendor import requests
 
 import pyblish.api
 
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py
index 4cba35963ca..8d9b0e1e419 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -1,10 +1,11 @@
 import os
+import re
 import json
 import getpass
 
+import requests
+
 from avalon import api
-from avalon.vendor import requests
-import re
 import pyblish.api
 import nuke
 
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py
index adf6d2d7582..8125a27d433 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py
@@ -5,10 +5,11 @@
 import json
 import re
 from copy import copy, deepcopy
+import requests
+import clique
 import openpype.api
 
 from avalon import api, io
-from avalon.vendor import requests, clique
 
 import pyblish.api
 
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py b/openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py
index ff664d9f831..d5016a4d825 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -1,7 +1,7 @@
-import pyblish.api
-
-from avalon.vendor import requests
 import os
+import requests
+
+import pyblish.api
 
 
 class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index addd4a2e80e..719c7dfe3ea 100644
--- a/openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/default_modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -1,8 +1,8 @@
 import os
 import json
-import pyblish.api
+import requests
 
-from avalon.vendor import requests
+import pyblish.api
 
 from openpype.lib.abstract_submit_deadline import requests_get
 from openpype.lib.delivery import collect_frames
diff --git a/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py b/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py
index d2754d1f925..2505d671af6 100644
--- a/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py
+++ b/openpype/modules/default_modules/royal_render/plugins/publish/collect_sequences_from_job.py
@@ -17,7 +17,7 @@ def collect(root,
             frame_end=None):
     """Collect sequence collections in root"""
 
-    from avalon.vendor import clique
+    import clique
 
     files = []
     for filename in os.listdir(root):
diff --git a/openpype/plugins/load/copy_file.py b/openpype/plugins/load/copy_file.py
index 1acacf6b27d..eaf58530353 100644
--- a/openpype/plugins/load/copy_file.py
+++ b/openpype/plugins/load/copy_file.py
@@ -18,7 +18,7 @@ def load(self, context, name=None, namespace=None, data=None):
 
     @staticmethod
     def copy_file_to_clipboard(path):
-        from avalon.vendor.Qt import QtCore, QtWidgets
+        from Qt import QtCore, QtWidgets
 
         clipboard = QtWidgets.QApplication.clipboard()
         assert clipboard, "Must have running QApplication instance"
diff --git a/openpype/plugins/load/copy_file_path.py b/openpype/plugins/load/copy_file_path.py
index f64f3e76d86..2041c79f6df 100644
--- a/openpype/plugins/load/copy_file_path.py
+++ b/openpype/plugins/load/copy_file_path.py
@@ -19,7 +19,7 @@ def load(self, context, name=None, namespace=None, data=None):
 
     @staticmethod
     def copy_path_to_clipboard(path):
-        from avalon.vendor.Qt import QtWidgets
+        from Qt import QtWidgets
 
         clipboard = QtWidgets.QApplication.clipboard()
         assert clipboard, "Must have running QApplication instance"
diff --git a/openpype/plugins/load/delete_old_versions.py b/openpype/plugins/load/delete_old_versions.py
index 263c534b64e..b2f2c889759 100644
--- a/openpype/plugins/load/delete_old_versions.py
+++ b/openpype/plugins/load/delete_old_versions.py
@@ -5,9 +5,9 @@
 import clique
 from pymongo import UpdateOne
 import ftrack_api
+from Qt import QtWidgets, QtCore
 
 from avalon import api, style
-from avalon.vendor.Qt import QtWidgets, QtCore
 from avalon.vendor import qargparse
 from avalon.api import AvalonMongoDB
 import avalon.pipeline
diff --git a/openpype/plugins/load/open_djv.py b/openpype/plugins/load/open_djv.py
index 5b49bb58d00..4b0e8411c89 100644
--- a/openpype/plugins/load/open_djv.py
+++ b/openpype/plugins/load/open_djv.py
@@ -32,7 +32,7 @@ class OpenInDJV(api.Loader):
 
     def load(self, context, name, namespace, data):
         directory = os.path.dirname(self.fname)
-        from avalon.vendor import clique
+        import clique
 
         pattern = clique.PATTERNS["frames"]
         files = os.listdir(directory)
diff --git a/openpype/plugins/load/open_file.py b/openpype/plugins/load/open_file.py
index b496311e0c2..4133a64eb37 100644
--- a/openpype/plugins/load/open_file.py
+++ b/openpype/plugins/load/open_file.py
@@ -27,7 +27,7 @@ class Openfile(api.Loader):
     color = "orange"
 
     def load(self, context, name, namespace, data):
-        from avalon.vendor import clique
+        import clique
 
         directory = os.path.dirname(self.fname)
         pattern = clique.PATTERNS["frames"]
diff --git a/openpype/tools/assetcreator/model.py b/openpype/tools/assetcreator/model.py
index 3af1d77127a..f84541ca2a9 100644
--- a/openpype/tools/assetcreator/model.py
+++ b/openpype/tools/assetcreator/model.py
@@ -1,8 +1,7 @@
 import re
 import logging
-import collections
 
-from avalon.vendor.Qt import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 from avalon.vendor import qtawesome
 from avalon import io
 from avalon import style
diff --git a/openpype/widgets/message_window.py b/openpype/widgets/message_window.py
index 969d6ccdd19..94e51f5d4f7 100644
--- a/openpype/widgets/message_window.py
+++ b/openpype/widgets/message_window.py
@@ -1,6 +1,6 @@
-from Qt import QtWidgets, QtCore
 import sys
 import logging
+from Qt import QtWidgets, QtCore
 
 log = logging.getLogger(__name__)
 
diff --git a/openpype/widgets/popup.py b/openpype/widgets/popup.py
index 7c0fa0f5c5b..40262495162 100644
--- a/openpype/widgets/popup.py
+++ b/openpype/widgets/popup.py
@@ -3,7 +3,7 @@
 import contextlib
 
 
-from avalon.vendor.Qt import QtCore, QtWidgets, QtGui
+from Qt import QtCore, QtWidgets, QtGui
 
 log = logging.getLogger(__name__)
 
diff --git a/openpype/widgets/project_settings.py b/openpype/widgets/project_settings.py
index c69d55fb396..43ff9f27896 100644
--- a/openpype/widgets/project_settings.py
+++ b/openpype/widgets/project_settings.py
@@ -1,10 +1,9 @@
-
-
-from avalon.vendor.Qt import QtCore, QtGui, QtWidgets
 import os
 import getpass
 import platform
 
+from Qt import QtCore, QtGui, QtWidgets
+
 from avalon import style
 import ftrack_api
 

From 2e77590e608f0880ceaac34a3c3b0263beaa9b42 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 25 Nov 2021 00:47:45 +0100
Subject: [PATCH 2/2] removed unused import

---
 openpype/widgets/popup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/widgets/popup.py b/openpype/widgets/popup.py
index 40262495162..3c3f6283c4b 100644
--- a/openpype/widgets/popup.py
+++ b/openpype/widgets/popup.py
@@ -3,7 +3,7 @@
 import contextlib
 
 
-from Qt import QtCore, QtWidgets, QtGui
+from Qt import QtCore, QtWidgets
 
 log = logging.getLogger(__name__)