1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py
index dd5ae1e83..25603186e 100644
--- a/src/lib/Bcfg2/Client/__init__.py
+++ b/src/lib/Bcfg2/Client/__init__.py
@@ -1,7 +1,5 @@
 """This contains all Bcfg2 Client modules"""
 
-__all__ = ["Frame", "Tools", "XML", "Client"]
-
 import os
 import sys
 import select
@@ -21,11 +19,8 @@ def prompt(msg):
     while len(select.select([sys.stdin.fileno()], [], [], 0.0)[0]) > 0:
         os.read(sys.stdin.fileno(), 4096)
     try:
-        ans = input(msg.encode(sys.stdout.encoding, 'replace'))
+        ans = input(msg)
         return ans in ['y', 'Y']
     except EOFError:
-        # python 2.4.3 on CentOS doesn't like ^C for some reason
-        return False
-    except:
-        print("Error while reading input: %s" % sys.exc_info()[1])
-        return False
+        # handle ^C on rhel-based platforms
+        raise SystemExit(1)