summaryrefslogtreecommitdiffstats
path: root/base/server/python
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/python')
-rw-r--r--base/server/python/pki/server/deployment/pkiconfig.py11
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py4
2 files changed, 10 insertions, 5 deletions
diff --git a/base/server/python/pki/server/deployment/pkiconfig.py b/base/server/python/pki/server/deployment/pkiconfig.py
index c22698cb6..bb99e8e31 100644
--- a/base/server/python/pki/server/deployment/pkiconfig.py
+++ b/base/server/python/pki/server/deployment/pkiconfig.py
@@ -21,6 +21,9 @@
# PKI Deployment Constants
from __future__ import print_function
+from __future__ import absolute_import
+from six.moves import input # pylint: disable=W0622
+
PKI_DEPLOYMENT_DEFAULT_CLIENT_DIR_PERMISSIONS = 0o0755
PKI_DEPLOYMENT_DEFAULT_DIR_PERMISSIONS = 0o0770
PKI_DEPLOYMENT_DEFAULT_EXE_PERMISSIONS = 0o0770
@@ -139,8 +142,8 @@ def prepare_for_an_external_java_debugger(instance):
print(" \"address=8000,server=y,suspend=n \"")
print(" \"-Djava.awt.headless=true -Xmx128M\"")
print()
- raw_input("Enable external java debugger 'JAVA_OPTS' "
- "and press return to continue . . . ")
+ input("Enable external java debugger 'JAVA_OPTS' "
+ "and press return to continue . . . ")
print()
print(PKI_DEPLOYMENT_INTERRUPT_BANNER)
print()
@@ -155,8 +158,8 @@ def wait_to_attach_an_external_java_debugger():
print("the 'address' selected by 'JAVA_OPTS' (e. g. - port 8000) and")
print("set any desired breakpoints")
print()
- raw_input("Please attach an external java debugger "
- "and press return to continue . . . ")
+ input("Please attach an external java debugger "
+ "and press return to continue . . . ")
print()
print(PKI_DEPLOYMENT_INTERRUPT_BANNER)
print()
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 84e14bfec..fc11f54b2 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -35,6 +35,8 @@ import subprocess
import xml.etree.ElementTree as ET
from urlparse import urlparse
+from six.moves import input # pylint: disable=W0622
+
# PKI Imports
import pki
import pki.upgrade
@@ -262,7 +264,7 @@ class PKIConfigParser:
done = False
while not done:
- value = raw_input(message)
+ value = input(message)
value = value.strip()
if len(value) == 0: # empty value