Jira WDT-15 - Prepend local package path to avoid conflicts with pwd; don't prepend for Jython tools (#682)

Author: rakillen

core/src/main/python/create.py

@@ -17,10 +17,9 @@
 from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
 
 # imports from local packages start here
-
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.model_constants import DEFAULT_WLS_DOMAIN_NAME

core/src/main/python/deploy.py

@@ -16,7 +16,7 @@
 from oracle.weblogic.deploy.util import CLAException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
 
 # imports from local packages start here
 from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/discover.py

@@ -22,7 +22,7 @@
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 from oracle.weblogic.deploy.validate import ValidateException
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
 
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/encrypt.py

@@ -18,7 +18,7 @@
 from oracle.weblogic.deploy.util import VariableException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+# Jython tools don't require sys.path modification
 
 # imports from local packages start here
 from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/extract_resource.py

@@ -11,7 +11,7 @@
 from oracle.weblogic.deploy.util import CLAException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+# Jython tools don't require sys.path modification
 
 # imports from local packages start here
 from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/model_help.py

@@ -9,7 +9,7 @@
 from oracle.weblogic.deploy.util import CLAException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+# Jython tools don't require sys.path modification
 
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.exception import exception_helper

core/src/main/python/prepare_model.py

@@ -27,6 +27,8 @@
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 from oracle.weblogic.deploy.validate import ValidateException
 
+# Jython tools don't require sys.path modification
+
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ADMIN_USERNAME

core/src/main/python/update.py

@@ -15,7 +15,7 @@
 from oracle.weblogic.deploy.util import CLAException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+sys.path.insert(0, os.path.dirname(os.path.realpath(sys.argv[0])))
 
 # imports from local packages start here
 from wlsdeploy.aliases.aliases import Aliases

core/src/main/python/validate.py

@@ -17,7 +17,7 @@
 
 from oracle.weblogic.deploy.logging import SummaryHandler
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+# Jython tools don't require sys.path modification
 
 # imports from local packages start here
 from wlsdeploy.aliases.wlst_modes import WlstModes

core/src/main/python/variable_inject.py

@@ -4,7 +4,6 @@
 
 The entry point for the injectVariables tool.
 """
-import os
 import sys
 
 from java.io import File
@@ -15,7 +14,7 @@
 from oracle.weblogic.deploy.util import WLSDeployArchiveIOException
 from oracle.weblogic.deploy.util import WebLogicDeployToolingVersion
 
-sys.path.append(os.path.dirname(os.path.realpath(sys.argv[0])))
+# Jython tools don't require sys.path modification
 
 import wlsdeploy.tool.util.variable_injector as variable_injector
 from wlsdeploy.aliases.wlst_modes import WlstModes