diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-04-07 13:51:24 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-04-07 13:51:24 -0500 |
| commit | 1d2b0215f5957d4ec0d320984c93328a39d3b08c (patch) | |
| tree | 34e320967a1503358ad988a10aaf3f52a0a6a99d /src/lib/Client/Tools/Action.py | |
| parent | 742fc83dcdb82639b97723ce4cbfade75fb1aa71 (diff) | |
| download | bcfg2-1d2b0215f5957d4ec0d320984c93328a39d3b08c.tar.gz bcfg2-1d2b0215f5957d4ec0d320984c93328a39d3b08c.tar.bz2 bcfg2-1d2b0215f5957d4ec0d320984c93328a39d3b08c.zip | |
Client: PY3K + PEP8 fixes
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Client/Tools/Action.py')
| -rw-r--r-- | src/lib/Client/Tools/Action.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/Action.py b/src/lib/Client/Tools/Action.py index 452788f94..bc57a0e27 100644 --- a/src/lib/Client/Tools/Action.py +++ b/src/lib/Client/Tools/Action.py @@ -31,7 +31,12 @@ class Action(Bcfg2.Client.Tools.Tool): if self.setup['interactive']: prompt = ('Run Action %s, %s: (y/N): ' % (entry.get('name'), entry.get('command'))) - if raw_input(prompt) not in ['y', 'Y']: + # py3k compatibility + try: + ans = raw_input(prompt) + except NameError: + ans = input(prompt) + if ans not in ['y', 'Y']: return False if self.setup['servicemode'] == 'build': if entry.get('build', 'true') == 'false': |