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/Server/Admin/Tidy.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/Server/Admin/Tidy.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Tidy.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Tidy.py b/src/lib/Bcfg2/Server/Admin/Tidy.py index 82319b93e..65aa955b4 100644 --- a/src/lib/Bcfg2/Server/Admin/Tidy.py +++ b/src/lib/Bcfg2/Server/Admin/Tidy.py @@ -3,6 +3,7 @@ import re import socket import Bcfg2.Server.Admin +from Bcfg2.Bcfg2Py3k import input class Tidy(Bcfg2.Server.Admin.Mode): @@ -22,11 +23,7 @@ class Tidy(Bcfg2.Server.Admin.Mode): if '-f' in args or '-I' in args: if '-I' in args: for name in badfiles[:]: - # py3k compatibility - try: - answer = raw_input("Unlink file %s? [yN] " % name) - except NameError: - answer = input("Unlink file %s? [yN] " % name) + answer = input("Unlink file %s? [yN] " % name) if answer not in ['y', 'Y']: badfiles.remove(name) for name in badfiles: |