From e7691d36b70968ae6fd7f7d537922a6da45fc1d1 Mon Sep 17 00:00:00 2001 From: Johannes Gijsbers Date: Tue, 17 Aug 2004 13:21:53 +0000 Subject: [PATCH] Use readline/raw_input() in pydoc.Helper.interact if available and self.input is sys.stdin. Based on a patch (#726204) by Dmitry Vasiliev and a comment from Guido in an older patch (#549901). --- Lib/pydoc.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index c02c1407f74..12ae27795cd 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1618,16 +1618,24 @@ has the same effect as typing a particular string at the help> prompt. def interact(self): self.output.write('\n') while True: - self.output.write('help> ') - self.output.flush() try: - request = self.input.readline() + request = self.getline('help> ') if not request: break - except KeyboardInterrupt: break + except (KeyboardInterrupt, EOFError): + break request = strip(replace(request, '"', '', "'", '')) if lower(request) in ['q', 'quit']: break self.help(request) + def getline(self, prompt): + """Read one line, using raw_input when available.""" + if self.input is sys.stdin: + return raw_input(prompt) + else: + self.output.write(prompt) + self.output.flush() + return self.input.readline() + def help(self, request): if type(request) is type(''): if request == 'help': self.intro()