PY3K: Refactor input code

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

9 files changed, 40 insertions, 71 deletions

diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py
index 6af8b3e5c..5b74d4225 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Bcfg2Py3k.py
@@ -75,6 +75,11 @@ def u_str(string, encoding=None):
         else:
             return unicode(string)
 
+try:
+    input = raw_input
+except:
+    input = input
+
 if sys.hexversion >= 0x03000000:
     from io import FileIO as file
 else:
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)
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index 6a6083782..8d0c2a4a9 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -6,9 +6,11 @@ import stat
 import string
 import sys
 import subprocess
+
 import Bcfg2.Server.Admin
 import Bcfg2.Server.Plugin
 import Bcfg2.Options
+from Bcfg2.Bcfg2Py3k import input
 
 # default config file
 config = '''
@@ -106,14 +108,6 @@ plugin_list = ['Account',
 default_plugins = Bcfg2.Options.SERVER_PLUGINS.default
 
 
-def get_input(prompt):
-    """py3k compatible function to get input"""
-    try:
-        return raw_input(prompt)
-    except NameError:
-        return input(prompt)
-
-
 def gen_password(length):
     """Generates a random alphanumeric password with length characters."""
     chars = string.letters + string.digits
@@ -147,8 +141,8 @@ def create_key(hostname, keypath, certpath, country, state, location):
 def create_conf(confpath, confdata, keypath):
     # Don't overwrite existing bcfg2.conf file
     if os.path.exists(confpath):
-        result = get_input("\nWarning: %s already exists. "
-                           "Overwrite? [y/N]: " % confpath)
+        result = input("\nWarning: %s already exists. "
+                       "Overwrite? [y/N]: " % confpath)
         if result not in ['Y', 'y']:
             print("Leaving %s unchanged" % confpath)
             return
@@ -206,8 +200,8 @@ class Init(Bcfg2.Server.Admin.Mode):
 
     def _prompt_hostname(self):
         """Ask for the server hostname."""
-        data = get_input("What is the server's hostname [%s]: " %
-                            socket.getfqdn())
+        data = input("What is the server's hostname [%s]: " %
+                     socket.getfqdn())
         if data != '':
             self.shostname = data
         else:
@@ -215,21 +209,21 @@ class Init(Bcfg2.Server.Admin.Mode):
 
     def _prompt_config(self):
         """Ask for the configuration file path."""
-        newconfig = get_input("Store Bcfg2 configuration in [%s]: " %
-                                self.configfile)
+        newconfig = input("Store Bcfg2 configuration in [%s]: " %
+                          self.configfile)
         if newconfig != '':
             self.configfile = os.path.abspath(newconfig)
 
     def _prompt_repopath(self):
         """Ask for the repository path."""
         while True:
-            newrepo = get_input("Location of Bcfg2 repository [%s]: " %
-                                    self.repopath)
+            newrepo = input("Location of Bcfg2 repository [%s]: " %
+                            self.repopath)
             if newrepo != '':
                 self.repopath = os.path.abspath(newrepo)
             if os.path.isdir(self.repopath):
-                response = get_input("Directory %s exists. Overwrite? [y/N]:" \
-                                        % self.repopath)
+                response = input("Directory %s exists. Overwrite? [y/N]:" \
+                                 % self.repopath)
                 if response.lower().strip() == 'y':
                     break
             else:
@@ -245,8 +239,8 @@ class Init(Bcfg2.Server.Admin.Mode):
 
     def _prompt_server(self):
         """Ask for the server name."""
-        newserver = get_input("Input the server location [%s]: " %
-                                self.server_uri)
+        newserver = input("Input the server location [%s]: " %
+                          self.server_uri)
         if newserver != '':
             self.server_uri = newserver
 
@@ -258,19 +252,19 @@ class Init(Bcfg2.Server.Admin.Mode):
         prompt += ': '
         while True:
             try:
-                osidx = int(get_input(prompt))
+                osidx = int(input(prompt))
                 self.os_sel = os_list[osidx - 1][1]
                 break
             except ValueError:
                 continue
 
     def _prompt_plugins(self):
-        default = get_input("Use default plugins? (%s) [Y/n]: " %
-                            ''.join(default_plugins)).lower()
+        default = input("Use default plugins? (%s) [Y/n]: " %
+                        ''.join(default_plugins)).lower()
         if default != 'y' or default != '':
             while True:
                 plugins_are_valid = True
-                plug_str = get_input("Specify plugins: ")
+                plug_str = input("Specify plugins: ")
                 plugins = plug_str.split(',')
                 for plugin in plugins:
                     plugin = plugin.strip()
@@ -284,26 +278,26 @@ class Init(Bcfg2.Server.Admin.Mode):
         """Ask for the key details (country, state, and location)."""
         print("The following questions affect SSL certificate generation.")
         print("If no data is provided, the default values are used.")
-        newcountry = get_input("Country name (2 letter code) for certificate: ")
+        newcountry = input("Country name (2 letter code) for certificate: ")
         if newcountry != '':
             if len(newcountry) == 2:
                 self.country = newcountry
             else:
                 while len(newcountry) != 2:
-                    newcountry = get_input("2 letter country code (eg. US): ")
+                    newcountry = input("2 letter country code (eg. US): ")
                     if len(newcountry) == 2:
                         self.country = newcountry
                         break
         else:
             self.country = 'US'
 
-        newstate = get_input("State or Province Name (full name) for certificate: ")
+        newstate = input("State or Province Name (full name) for certificate: ")
         if newstate != '':
             self.state = newstate
         else:
             self.state = 'Illinois'
 
-        newlocation = get_input("Locality Name (eg, city) for certificate: ")
+        newlocation = input("Locality Name (eg, city) for certificate: ")
         if newlocation != '':
             self.location = newlocation
         else:
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index daf353107..816fd2ca7 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -2,6 +2,7 @@ import getopt
 import sys
 
 import Bcfg2.Server.Admin
+from Bcfg2.Bcfg2Py3k import input
 
 
 class Pull(Bcfg2.Server.Admin.MetadataCore):
@@ -109,11 +110,8 @@ class Pull(Bcfg2.Server.Admin.MetadataCore):
                           (choice.group, choice.prio))
                 else:
                     print(" => host entry: %s" % (choice.hostname))
-                # py3k compatibility
-                try:
-                    ans = raw_input("Use this entry? [yN]: ") in ['y', 'Y']
-                except NameError:
-                    ans = input("Use this entry? [yN]: ") in ['y', 'Y']
+
+                ans = input("Use this entry? [yN]: ") in ['y', 'Y']
                 if ans:
                     return choice
             return False
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:
diff --git a/src/lib/Bcfg2/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
index aeb3b9f74..232dbb0c3 100644
--- a/src/lib/Bcfg2/Server/Plugins/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
@@ -14,6 +14,7 @@ import threading
 
 # Compatibility import
 from Bcfg2.Bcfg2Py3k import Queue
+from Bcfg2.Bcfg2Py3k import u_str
 
 logger = logging.getLogger('Snapshots')
 
@@ -28,14 +29,6 @@ datafields = {
              }
 
 
-# py3k compatibility
-def u_str(string):
-    if sys.hexversion >= 0x03000000:
-        return string
-    else:
-        return unicode(string)
-
-
 def build_snap_ent(entry):
     basefields = []
     if entry.tag in ['Package', 'Service']:
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
index 36d4cf693..0d4c6501d 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
@@ -4,6 +4,8 @@ from django.utils.encoding import smart_unicode
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
+from Bcfg2.Bcfg2Py3k import u_str
+
 register = template.Library()
 
 try:
@@ -16,14 +18,6 @@ except:
     colorize = False
 
 
-# py3k compatibility
-def u_str(string):
-    if sys.hexversion >= 0x03000000:
-        return string
-    else:
-        return unicode(string)
-
-
 @register.filter
 def syntaxhilight(value, arg="diff", autoescape=None):
     """
diff --git a/src/lib/Bcfg2/Server/Snapshots/model.py b/src/lib/Bcfg2/Server/Snapshots/model.py
index 5d7973c16..0bbd206da 100644
--- a/src/lib/Bcfg2/Server/Snapshots/model.py
+++ b/src/lib/Bcfg2/Server/Snapshots/model.py
@@ -6,13 +6,7 @@ import sqlalchemy.exceptions
 from sqlalchemy.orm import relation, backref
 from sqlalchemy.ext.declarative import declarative_base
 
-
-# py3k compatibility
-def u_str(string):
-    if sys.hexversion >= 0x03000000:
-        return string
-    else:
-        return unicode(string)
+from Bcfg2.Bcfg2Py3k import u_str
 
 
 class Uniquer(object):