Fix references to raw_input()

IPython/core/crashhandler.py

@@ -28,6 +28,7 b' from pprint import pformat'
 from IPython.core import ultratb
 from IPython.core.release import author_email
 from IPython.utils.sysinfo import sys_info
+from IPython.utils.py3compat import input
 
 #-----------------------------------------------------------------------------
 # Code
@@ -176,7 +177,7 b' class CrashHandler(object):'
         # Construct report on disk
         report.write(self.make_report(traceback))
         report.close()
-        raw_input("Hit <Enter> to quit (your terminal may close):")
+        input("Hit <Enter> to quit (your terminal may close):")
 
     def make_report(self,traceback):
         """Return a string containing a crash report."""

IPython/core/page.py

@@ -314,7 +314,7 b" if os.name == 'nt' and os.environ.get('TERM','dumb') != 'emacs':"
         return result
 else:
     def page_more():
-        ans = raw_input('---Return to continue, q to quit--- ')
+        ans = py3compat.input('---Return to continue, q to quit--- ')
         if ans.lower().startswith('q'):
             return False
         else:
@@ -345,6 +345,6 b" def snip_print(str,width = 75,print_full = 0,header = ''):"
         print(str[:whalf] + ' <...> ' + str[-whalf:])
         snip = 1
     if snip and print_full == 2:
-        if raw_input(header+' Snipped. View (y/n)? [N]').lower() == 'y':
+        if py3compat.input(header+' Snipped. View (y/n)? [N]').lower() == 'y':
             page(str)
     return snip

IPython/core/tests/test_inputsplitter.py

@@ -29,7 +29,7 b' from IPython.core import inputsplitter as isp'
 from IPython.core.tests.test_inputtransformer import syntax, syntax_ml
 from IPython.testing import tools as tt
 from IPython.utils import py3compat
-from IPython.utils.py3compat import string_types
+from IPython.utils.py3compat import string_types, input
 
 #-----------------------------------------------------------------------------
 # Semi-complete examples (also used as tests)
@@ -489,9 +489,9 b" if __name__ == '__main__':"
             while isp.push_accepts_more():
                 indent = ' '*isp.indent_spaces
                 if autoindent:
-                    line = indent + raw_input(prompt+indent)
+                    line = indent + input(prompt+indent)
                 else:
-                    line = raw_input(prompt)
+                    line = input(prompt)
                 isp.push(line)
                 prompt = '... '
 

IPython/lib/demo.py

@@ -186,6 +186,7 b' import sys'
 from IPython.utils import io
 from IPython.utils.text import marquee
 from IPython.utils import openpy
+from IPython.utils import py3compat
 __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError']
 
 class DemoError(Exception): pass
@@ -449,7 +450,7 b' class Demo(object):'
                     print(marquee('output:'), file=io.stdout)
                 else:
                     print(marquee('Press <q> to quit, <Enter> to execute...'), end=' ', file=io.stdout)
-                    ans = raw_input().strip()
+                    ans = py3compat.input().strip()
                     if ans:
                         print(marquee('Block NOT executed'), file=io.stdout)
                         return

IPython/lib/editorhooks.py

@@ -12,6 +12,7 b' import subprocess'
 
 from IPython import get_ipython
 from IPython.core.error import TryNext
+from IPython.utils import py3compat
 
 
 def install_editor(template, wait=False):
@@ -51,7 +52,7 b' def install_editor(template, wait=False):'
         if wait and proc.wait() != 0:
             raise TryNext()
         if wait:
-            raw_input("Press Enter when done editing:")
+            py3compat.input("Press Enter when done editing:")
 
     get_ipython().set_hook('editor', call_editor)
     get_ipython().editor = template

IPython/terminal/console/interactiveshell.py

@@ -31,7 +31,7 b' except ImportError:'
 from IPython.core import page
 from IPython.utils.warn import warn, error
 from IPython.utils import io
-from IPython.utils.py3compat import string_types
+from IPython.utils.py3compat import string_types, input
 from IPython.utils.traitlets import List, Enum, Any, Instance, Unicode, Float
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 
@@ -330,7 +330,7 b' class ZMQTerminalInteractiveShell(TerminalInteractiveShell):'
             signal.signal(signal.SIGINT, double_int)
             
             try:
-                raw_data = raw_input(msg_rep["content"]["prompt"])
+                raw_data = input(msg_rep["content"]["prompt"])
             except EOFError:
                 # turn EOFError into EOF character
                 raw_data = '\x04'

IPython/utils/io.py

@@ -18,7 +18,7 b' import os'
 import sys
 import tempfile
 from .capture import CapturedIO, capture_output
-from .py3compat import string_types
+from .py3compat import string_types, input
 
 #-----------------------------------------------------------------------------
 # Code
@@ -170,7 +170,7 b' def ask_yes_no(prompt,default=None):'
     ans = None
     while ans not in answers.keys():
         try:
-            ans = raw_input(prompt+' ').lower()
+            ans = input(prompt+' ').lower()
             if not ans:  # response was an empty string
                 ans = default
         except KeyboardInterrupt: