From 91167b2c01e5a0abafd0c111fa3546601e1f5cf0 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 13 Sep 2012 10:39:40 -0400
Subject: bcfg2-crypt: added -I option, made --stdout better, updated man page

---
 src/lib/Bcfg2/Client/Frame.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Client')

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:
-- 
cgit v1.2.3-1-g7c22