From 200f79387247eefa01d60e4f6e573ba5162054bc Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Tue, 5 Jun 2012 17:00:40 -0500
Subject: PY3K: Refactor input code

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/lib/Bcfg2/Client/Tools/Action.py   | 7 ++-----
 src/lib/Bcfg2/Client/Tools/__init__.py | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

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

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