diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-13 10:39:40 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-13 10:39:40 -0400 |
| commit | 91167b2c01e5a0abafd0c111fa3546601e1f5cf0 (patch) | |
| tree | d907db32c9f3d37896846fe3e8c4aeddedbf5acf /src/lib/Bcfg2/Client/Frame.py | |
| parent | e2355c04d5b79866eb9ca26f1303cbf5fa36b757 (diff) | |
| download | bcfg2-91167b2c01e5a0abafd0c111fa3546601e1f5cf0.tar.gz bcfg2-91167b2c01e5a0abafd0c111fa3546601e1f5cf0.tar.bz2 bcfg2-91167b2c01e5a0abafd0c111fa3546601e1f5cf0.zip | |
bcfg2-crypt: added -I option, made --stdout better, updated man page
Diffstat (limited to 'src/lib/Bcfg2/Client/Frame.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Frame.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py index 508e3b616..2fb81d6ba 100644 --- a/src/lib/Bcfg2/Client/Frame.py +++ b/src/lib/Bcfg2/Client/Frame.py @@ -7,6 +7,7 @@ import logging import sys import time import Bcfg2.Client.Tools +from Bcfg2.Compat import input def cmpent(ent1, ent2): @@ -150,12 +151,7 @@ class Frame(object): else: iprompt = prompt % (entry.tag, entry.get('name')) try: - # py3k compatibility - try: - ans = raw_input(iprompt.encode(sys.stdout.encoding, - 'replace')) - except NameError: - ans = input(iprompt) + ans = input(iprompt.encode(sys.stdout.encoding, 'replace')) if ans in ['y', 'Y']: ret.append(entry) except EOFError: |