From 88be0405986196894b16ae5cb98d303d3d0e9598 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 11 Aug 2022 12:43:50 +0200
Subject: [PATCH] modev 'add_implementation_envs' to maya module and
 application knows that it should look there

---
 openpype/hosts/maya/__init__.py | 28 ----------------------------
 openpype/hosts/maya/module.py   | 27 +++++++++++++++++++++++++++
 openpype/lib/applications.py    |  6 ++++--
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/openpype/hosts/maya/__init__.py b/openpype/hosts/maya/__init__.py
index 2178534b89..72b4d5853c 100644
--- a/openpype/hosts/maya/__init__.py
+++ b/openpype/hosts/maya/__init__.py
@@ -1,34 +1,6 @@
-import os
 from .module import OpenPypeMaya
 
 
-def add_implementation_envs(env, _app):
-    # Add requirements to PYTHONPATH
-    pype_root = os.environ["OPENPYPE_REPOS_ROOT"]
-    new_python_paths = [
-        os.path.join(pype_root, "openpype", "hosts", "maya", "startup")
-    ]
-    old_python_path = env.get("PYTHONPATH") or ""
-    for path in old_python_path.split(os.pathsep):
-        if not path:
-            continue
-
-        norm_path = os.path.normpath(path)
-        if norm_path not in new_python_paths:
-            new_python_paths.append(norm_path)
-
-    env["PYTHONPATH"] = os.pathsep.join(new_python_paths)
-
-    # Set default values if are not already set via settings
-    defaults = {
-        "OPENPYPE_LOG_NO_COLORS": "Yes"
-    }
-    for key, value in defaults.items():
-        if not env.get(key):
-            env[key] = value
-
-
 __all__ = (
     "OpenPypeMaya",
-    "add_implementation_envs",
 )
diff --git a/openpype/hosts/maya/module.py b/openpype/hosts/maya/module.py
index 8dfd96d4ab..0af68788bc 100644
--- a/openpype/hosts/maya/module.py
+++ b/openpype/hosts/maya/module.py
@@ -1,6 +1,9 @@
+import os
 from openpype.modules import OpenPypeModule
 from openpype.modules.interfaces import IHostModule
 
+MAYA_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
+
 
 class OpenPypeMaya(OpenPypeModule, IHostModule):
     name = "openpype_maya"
@@ -8,3 +11,27 @@ class OpenPypeMaya(OpenPypeModule, IHostModule):
 
     def initialize(self, module_settings):
         self.enabled = True
+
+    def add_implementation_envs(self, env, _app):
+        # Add requirements to PYTHONPATH
+        new_python_paths = [
+            os.path.join(MAYA_ROOT_DIR, "startup")
+        ]
+        old_python_path = env.get("PYTHONPATH") or ""
+        for path in old_python_path.split(os.pathsep):
+            if not path:
+                continue
+
+            norm_path = os.path.normpath(path)
+            if norm_path not in new_python_paths:
+                new_python_paths.append(norm_path)
+
+        env["PYTHONPATH"] = os.pathsep.join(new_python_paths)
+
+        # Set default values if are not already set via settings
+        defaults = {
+            "OPENPYPE_LOG_NO_COLORS": "Yes"
+        }
+        for key, value in defaults.items():
+            if not env.get(key):
+                env[key] = value
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index da8623ea13..e47ec8cd11 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -1508,8 +1508,10 @@ def prepare_app_environments(
     final_env = None
     # Add host specific environments
     if app.host_name and implementation_envs:
-        module = __import__("openpype.hosts", fromlist=[app.host_name])
-        host_module = getattr(module, app.host_name, None)
+        host_module = modules_manager.get_host_module(app.host_name)
+        if not host_module:
+            module = __import__("openpype.hosts", fromlist=[app.host_name])
+            host_module = getattr(module, app.host_name, None)
         add_implementation_envs = None
         if host_module:
             add_implementation_envs = getattr(