cura-tools-devel March 2014

cura-tools-devel@lists.fedorahosted.org

2 participants
16 discussions

[cura-tools] master, openlmi-tools-lmiwbem: improve local imports search path (ebcb0e7)
by phatina＠fedoraproject.org 06 Mar '14

06 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branches: master,openlmi-tools-lmiwbem >--------------------------------------------------------------- commit ebcb0e7b6813523ef05e043db0f344ec08ebbc32 Author: Peter Hatina <phatina(a)redhat.com> Date: Thu Mar 6 14:15:29 2014 +0100 improve local imports search path Introduce --cwd-first-in-path CLI option. When used, CWD is prepended in search path, appended otherwise. >--------------------------------------------------------------- cli/completion/_lmishell | 3 ++- cli/completion/lmishell.bash | 2 +- cli/lmi/shell/LMIConsole.py | 12 ++++++++---- cli/lmi/shell/LMIShellOptions.py | 11 +++++++++++ cli/lmishell | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/cli/completion/_lmishell b/cli/completion/_lmishell index 28a51e4..bb2a3fe 100644 --- a/cli/completion/_lmishell +++ b/cli/completion/_lmishell @@ -31,5 +31,6 @@ _lmishell() { '(-v --verbose)'{-v,--verbose}'[print log messages to stderr]' \ '(-m --more-verbose)'{-m,--more-verbose}'[print all log messages to stderr]' \ '(-q --quiet)'{-q,--quiet}'[do not print any log messages to stderr]' \ - '(-n --noverify)'{-n,--noverify}'[do not verify CIMOM SSL certificate]' + '(-n --noverify)'{-n,--noverify}'[do not verify CIMOM SSL certificate]' \ + '--cwd-first-in-path[prepend CWD in sys.path instead of appending it]' } diff --git a/cli/completion/lmishell.bash b/cli/completion/lmishell.bash index 9d3ec2a..0595f5c 100644 --- a/cli/completion/lmishell.bash +++ b/cli/completion/lmishell.bash @@ -23,7 +23,7 @@ _lmishell() { oldifs=$IFS IFS=$'\n' - local options=(-h -i -v -m -q -n --help --interact --verbose --more-verbose --quiet --noverify) + local options=(-h -i -v -m -q -n --help --interact --verbose --more-verbose --quiet --noverify --cwd-first-in-path) local current="${COMP_WORDS[$COMP_CWORD]}" local hasfile=no for (( i=1; i < ${#COMP_WORDS[@]} - 1; i++ )); do diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py index 03136f1..2aac84b 100644 --- a/cli/lmi/shell/LMIConsole.py +++ b/cli/lmi/shell/LMIConsole.py @@ -72,7 +72,7 @@ class LMIConsole(code.InteractiveConsole): "help" : LMIHelper() } - def __init__(self): + def __init__(self, cwd_first_in_path=False): # Setup default LMIConsole locals, that are needed # for proper object construction locals = dict(LMIConsole.DEFAULT_LOCALS.items()) @@ -90,9 +90,13 @@ class LMIConsole(code.InteractiveConsole): # should propagate caught exceptions, or dump them lmi_set_use_exceptions(self._use_exceptions) - # Append current working directory into Python's search list, so we can - # properly import any module placed in CWD - sys.path.append(os.getcwd()) + # Append/Prepend current working directory into Python's search list, so we can + # properly import any module placed in CWD. By default, the CWD is appended for + # security reasons. + if cwd_first_in_path: + sys.path.insert(0, os.getcwd()) + else: + sys.path.append(os.getcwd()) def setup_completer(self): """ diff --git a/cli/lmi/shell/LMIShellOptions.py b/cli/lmi/shell/LMIShellOptions.py index d7d8377..8ee0d6d 100644 --- a/cli/lmi/shell/LMIShellOptions.py +++ b/cli/lmi/shell/LMIShellOptions.py @@ -76,6 +76,9 @@ class LMIShellOptions(object): parser.add_argument("-n", "--noverify", dest="verifycert", action="store_false", default=True, help="do not verify CIMOM SSL certificate") + parser.add_argument("--cwd-first-in-path", dest="cwd_first_in_path", + action="store_true", default=False, + help="prepend CWD in sys.path instead of appending it") # Split CLI arguments into LMIShell ones and script ones. LMIShell arguments # are those, which are before the first positional argument. Other CLI arguments @@ -94,6 +97,7 @@ class LMIShellOptions(object): # Store CLI options self._interact = options.interact self._verifycert = options.verifycert + self._cwd_first_in_path = options.cwd_first_in_path self._log = LMIShellOptions._LOG_DEFAULT if options.verbose: self._log = LMIShellOptions._LOG_VERBOSE @@ -163,3 +167,10 @@ class LMIShellOptions(object): :rtype: bool """ return self._verifycert + + @property + def cwd_first_in_path(self): + """ + :returns: True, if CWD should be prepended in sys.path; False if appended + """ + return self._cwd_first_in_path diff --git a/cli/lmishell b/cli/lmishell index 7988d53..0b41f6b 100755 --- a/cli/lmishell +++ b/cli/lmishell @@ -40,7 +40,7 @@ if __name__ == "__main__": # By default, print error messages to stderr stream logger.setLevel(logging.ERROR) - console = LMIConsole() + console = LMIConsole(options.cwd_first_in_path) console.set_verify_server_certificate(options.verify_server_cert) if options.interactive: console.interact()

1 0

[cura-tools] 0.9-fixes: fix local imports; move CWD at the end of import list (02939ee)
by phatina＠fedoraproject.org 04 Mar '14

04 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit 02939eea19495500c94a4d071ed157b452ae3e2a Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Mar 4 10:17:49 2014 +0100 fix local imports; move CWD at the end of import list >--------------------------------------------------------------- cli/lmi/shell/LMIConsole.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py index 2b8de45..174c52b 100644 --- a/cli/lmi/shell/LMIConsole.py +++ b/cli/lmi/shell/LMIConsole.py @@ -90,6 +90,10 @@ class LMIConsole(code.InteractiveConsole): # should propagate caught exceptions, or dump them lmi_set_use_exceptions(self._use_exceptions) + # Append current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.append(os.getcwd()) + def setup_completer(self): """ Initializes tab-completer. @@ -158,10 +162,6 @@ class LMIConsole(code.InteractiveConsole): sys.ps1 = LMIConsole.SHELL_PS1 sys.ps2 = LMIConsole.SHELL_PS2 - # Add current working directory into Python's search list, so we can - # properly import any module placed in CWD - sys.path.insert(0, os.getcwd()) - # Interact more = 0 while 1: @@ -246,10 +246,6 @@ class LMIConsole(code.InteractiveConsole): locals["connect"] = connect self.locals = dict(self.locals.items() + locals.items()) - # Add current working directory into Python's search list, so we can - # properly import any module placed in CWD - sys.path.insert(0, os.getcwd()) - # Execute the script sys.argv = script_argv exit_code = 0

1 0

[cura-tools] master: fix local imports; move CWD at the end of import list (3b862b0)
by phatina＠fedoraproject.org 04 Mar '14

04 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit 3b862b0632620e914123adb433098375b41c47d3 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Mar 4 10:17:49 2014 +0100 fix local imports; move CWD at the end of import list >--------------------------------------------------------------- cli/lmi/shell/LMIConsole.py | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py index a369617..03136f1 100644 --- a/cli/lmi/shell/LMIConsole.py +++ b/cli/lmi/shell/LMIConsole.py @@ -90,6 +90,10 @@ class LMIConsole(code.InteractiveConsole): # should propagate caught exceptions, or dump them lmi_set_use_exceptions(self._use_exceptions) + # Append current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.append(os.getcwd()) + def setup_completer(self): """ Initializes tab-completer. @@ -158,10 +162,6 @@ class LMIConsole(code.InteractiveConsole): sys.ps1 = LMIConsole.SHELL_PS1 sys.ps2 = LMIConsole.SHELL_PS2 - # Add current working directory into Python's search list, so we can - # properly import any module placed in CWD - sys.path.insert(0, os.getcwd()) - # Interact more = 0 while 1: @@ -246,10 +246,6 @@ class LMIConsole(code.InteractiveConsole): locals["connect"] = connect self.locals = dict(self.locals.items() + locals.items()) - # Add current working directory into Python's search list, so we can - # properly import any module placed in CWD - sys.path.insert(0, os.getcwd()) - # Execute the script sys.argv = script_argv exit_code = 0

1 0

[cura-tools] 0.9-fixes: fix local imports (7c6bcae)
by phatina＠fedoraproject.org 04 Mar '14

04 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : 0.9-fixes >--------------------------------------------------------------- commit 7c6bcae1a6a8eec39d8ff641f095189fb11ead27 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Mar 4 09:21:50 2014 +0100 fix local imports >--------------------------------------------------------------- cli/lmi/shell/LMIConsole.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py index f1c9c4f..2b8de45 100644 --- a/cli/lmi/shell/LMIConsole.py +++ b/cli/lmi/shell/LMIConsole.py @@ -158,6 +158,10 @@ class LMIConsole(code.InteractiveConsole): sys.ps1 = LMIConsole.SHELL_PS1 sys.ps2 = LMIConsole.SHELL_PS2 + # Add current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.insert(0, os.getcwd()) + # Interact more = 0 while 1: @@ -242,6 +246,10 @@ class LMIConsole(code.InteractiveConsole): locals["connect"] = connect self.locals = dict(self.locals.items() + locals.items()) + # Add current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.insert(0, os.getcwd()) + # Execute the script sys.argv = script_argv exit_code = 0

1 0

[cura-tools] master: fix local imports (b8fac49)
by phatina＠fedoraproject.org 04 Mar '14

04 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git On branch : master >--------------------------------------------------------------- commit b8fac496845af12c4492e40dd0f58ee17ce90d45 Author: Peter Hatina <phatina(a)redhat.com> Date: Tue Mar 4 09:21:50 2014 +0100 fix local imports >--------------------------------------------------------------- cli/lmi/shell/LMIConsole.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/cli/lmi/shell/LMIConsole.py b/cli/lmi/shell/LMIConsole.py index cb287a2..a369617 100644 --- a/cli/lmi/shell/LMIConsole.py +++ b/cli/lmi/shell/LMIConsole.py @@ -158,6 +158,10 @@ class LMIConsole(code.InteractiveConsole): sys.ps1 = LMIConsole.SHELL_PS1 sys.ps2 = LMIConsole.SHELL_PS2 + # Add current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.insert(0, os.getcwd()) + # Interact more = 0 while 1: @@ -242,6 +246,10 @@ class LMIConsole(code.InteractiveConsole): locals["connect"] = connect self.locals = dict(self.locals.items() + locals.items()) + # Add current working directory into Python's search list, so we can + # properly import any module placed in CWD + sys.path.insert(0, os.getcwd()) + # Execute the script sys.argv = script_argv exit_code = 0

1 0

[cura-tools] branch 'openlmi-tools-lmiwbem' created
by phatina＠fedoraproject.org 04 Mar '14

04 Mar '14

Repository : http://git.fedorahosted.org/cgit/cura-tools.git New branch : openlmi-tools-lmiwbem Referencing: 2f0d8e5adbd26c50f9c1080b50d5e4c56601fe9d

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

cura-tools-devel March 2014