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/__init__.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/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index e741b5e23..d423b6380 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -6,6 +6,7 @@ from subprocess import Popen, PIPE import time import Bcfg2.Client.XML +from Bcfg2.Bcfg2Py3k import input __all__ = [tool.split('.')[0] \ for tool in os.listdir(os.path.dirname(__file__)) \ @@ -334,11 +335,7 @@ class SvcTool(Tool): if self.setup['interactive']: prompt = ('Restart service %s?: (y/N): ' % entry.get('name')) - # py3k compatibility - try: - ans = raw_input(prompt) - except NameError: - ans = input(prompt) + ans = input(prompt) if ans not in ['y', 'Y']: continue rc = self.restart_service(entry) |