diff -r 176145438b1e -r 422fd05e9c91 eric6/DebugClients/Python/DebugClientBase.py
--- a/eric6/DebugClients/Python/DebugClientBase.py Thu Jun 25 19:09:55 2020 +0200
+++ b/eric6/DebugClients/Python/DebugClientBase.py Sat Jun 27 12:08:12 2020 +0200
@@ -38,7 +38,7 @@
###############################################################################
-def DebugClientRawInput(prompt=""):
+def DebugClientInput(prompt=""):
"""
Replacement for the standard input() builtin.
@@ -46,7 +46,7 @@
@param prompt prompt to be shown
@type str
- @return result of the raw_input()/input() call
+ @return result of the input() call
@rtype str
"""
if DebugClientInstance is None or not DebugClientInstance.redirect:
@@ -57,11 +57,11 @@
# Use our own input().
try:
DebugClientOrigInput = __builtins__.__dict__['input']
- __builtins__.__dict__['input'] = DebugClientRawInput
+ __builtins__.__dict__['input'] = DebugClientInput
except (AttributeError, KeyError):
import __main__
DebugClientOrigInput = __main__.__builtins__.__dict__['input']
- __main__.__builtins__.__dict__['input'] = DebugClientRawInput
+ __main__.__builtins__.__dict__['input'] = DebugClientInput
###############################################################################
@@ -233,7 +233,7 @@
return
self.__coding = default
- def input(self, prompt):
+ def input(self, prompt, echo=True):
"""
Public method to implement input() using the event loop.
@@ -243,7 +243,7 @@
"""
self.sendJsonCommand("RequestRaw", {
"prompt": prompt,
- "echo": True,
+ "echo": echo,
})
self.eventLoop(True)
return self.rawLine
@@ -1725,7 +1725,7 @@
# special handling for '__builtins__' (it's way too big)
if key == '__builtins__':
- rvalue = '<module __builtin__ (built-in)>'
+ rvalue = '<module builtins (built-in)>'
valtype = 'module'
if ConfigVarTypeStrings.index(valtype) in filterList:
continue
@@ -2201,6 +2201,3 @@
sysPath.insert(0, firstEntry)
sysPath.insert(0, '')
return sysPath
-
-#
-# eflag: noqa = M702
