get_openpype_username replaced usage of OPENPYPE_USERNAME environment in code

openpype/lib/__init__.py

@@ -79,6 +79,16 @@ from .avalon_context import (
     change_timer_to_current_context
 )
 
+from .local_settings import (
+    IniSettingRegistry,
+    JSONSettingRegistry,
+    OpenPypeSecureRegistry,
+    OpenPypeSettingsRegistry,
+    get_local_site_id,
+    change_openpype_mongo_url,
+    get_openpype_username
+)
+
 from .applications import (
     ApplicationLaunchFailed,
     ApplictionExecutableNotFound,
@@ -112,15 +122,6 @@ from .plugin_tools import (
     should_decompress
 )
 
-from .local_settings import (
-    IniSettingRegistry,
-    JSONSettingRegistry,
-    OpenPypeSecureRegistry,
-    OpenPypeSettingsRegistry,
-    get_local_site_id,
-    change_openpype_mongo_url
-)
-
 from .path_tools import (
     version_up,
     get_version_from_path,
@@ -179,6 +180,14 @@ __all__ = [
 
     "change_timer_to_current_context",
 
+    "IniSettingRegistry",
+    "JSONSettingRegistry",
+    "OpenPypeSecureRegistry",
+    "OpenPypeSettingsRegistry",
+    "get_local_site_id",
+    "change_openpype_mongo_url",
+    "get_openpype_username",
+
     "ApplicationLaunchFailed",
     "ApplictionExecutableNotFound",
     "ApplicationNotFound",
@@ -224,13 +233,6 @@ __all__ = [
     "validate_mongo_connection",
     "OpenPypeMongoConnection",
 
-    "IniSettingRegistry",
-    "JSONSettingRegistry",
-    "OpenPypeSecureRegistry",
-    "OpenPypeSettingsRegistry",
-    "get_local_site_id",
-    "change_openpype_mongo_url",
-
     "timeit",
 
     "is_overlapping_otio_ranges",

openpype/lib/applications.py

@@ -25,6 +25,7 @@ from . import (
     PypeLogger,
     Anatomy
 )
+from .local_settings import get_openpype_username
 from .avalon_context import (
     get_workdir_data,
     get_workdir_with_workdir_data
@@ -1224,7 +1225,7 @@ def _prepare_last_workfile(data, workdir):
         file_template = anatomy.templates["work"]["file"]
         workdir_data.update({
             "version": 1,
-            "user": os.environ.get("OPENPYPE_USERNAME") or getpass.getuser(),
+            "user": get_openpype_username(),
             "ext": extensions[0]
         })
 

openpype/plugins/publish/collect_current_pype_user.py

@@ -1,6 +1,7 @@
 import os
 import getpass
 import pyblish.api
+from openpype.lib import get_openpype_username
 
 
 class CollectCurrentUserPype(pyblish.api.ContextPlugin):
@@ -11,9 +12,6 @@ class CollectCurrentUserPype(pyblish.api.ContextPlugin):
     label = "Collect Pype User"
 
     def process(self, context):
-        user = os.getenv("OPENPYPE_USERNAME", "").strip()
-        if not user:
-            user = context.data.get("user", getpass.getuser())
-
+        user = get_openpype_username()
         context.data["user"] = user
         self.log.debug("Colected user \"{}\"".format(user))