diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-06-05 17:00:40 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-06-05 17:00:40 -0500 |
| commit | 200f79387247eefa01d60e4f6e573ba5162054bc (patch) | |
| tree | 489a8c5b3f4682374b565e602d71b2906f77c3f6 /src/lib/Bcfg2/Client/Tools/Action.py | |
| parent | f31d06a61e3a246118bab537923e1039ba3a2571 (diff) | |
| download | bcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.tar.gz bcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.tar.bz2 bcfg2-200f79387247eefa01d60e4f6e573ba5162054bc.zip | |
PY3K: Refactor input code
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Action.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index dc49347e9..e13134e1f 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -2,6 +2,7 @@ import Bcfg2.Client.Tools from Bcfg2.Client.Frame import matches_white_list, passes_black_list +from Bcfg2.Bcfg2Py3k import input """ <Action timing='pre|post|both' @@ -44,11 +45,7 @@ class Action(Bcfg2.Client.Tools.Tool): if self.setup['interactive']: prompt = ('Run Action %s, %s: (y/N): ' % (entry.get('name'), entry.get('command'))) - # py3k compatibility - try: - ans = raw_input(prompt) - except NameError: - ans = input(prompt) + ans = input(prompt) if ans not in ['y', 'Y']: return False if self.setup['servicemode'] == 'build': |