From af6449824c7dd84202d05494337fed021dc5e293 Mon Sep 17 00:00:00 2001
From: Christopher Cave-Ayland <c.cave-ayland@imperial.ac.uk>
Date: Mon, 27 Jan 2020 21:08:23 +0000
Subject: [PATCH] Removed references to missing py3compat routines

---
 rlipython/shell.py | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/rlipython/shell.py b/rlipython/shell.py
index bd5fabf..1c8a454 100644
--- a/rlipython/shell.py
+++ b/rlipython/shell.py
@@ -56,7 +56,7 @@ def get_pasted_lines(sentinel, l_input=py3compat.input, quiet=False):
         prompt = ""
     while True:
         try:
-            l = py3compat.str_to_unicode(l_input(prompt))
+            l = l_input(prompt)
             if l == sentinel:
                 return
             else:
@@ -377,12 +377,10 @@ def refill_readline_hist(self):
             if cell and (cell != last_cell):
                 try:
                     if self.multiline_history:
-                          self.readline.add_history(py3compat.unicode_to_str(cell,
-                                                                    stdin_encoding))
+                          self.readline.add_history(cell)
                     else:
                         for line in cell.splitlines():
-                            self.readline.add_history(py3compat.unicode_to_str(line,
-                                                                    stdin_encoding))
+                            self.readline.add_history(line)
                     last_cell = cell
 
                 except (TypeError, ValueError) as e:
@@ -484,8 +482,7 @@ def _replace_rlhist_multiline(self, source_raw, hlen_before_cell):
         for i in range(hlen - hlen_before_cell):
             self.readline.remove_history_item(hlen - i - 1)
         stdin_encoding = get_stream_enc(sys.stdin, 'utf-8')
-        self.readline.add_history(py3compat.unicode_to_str(source_raw.rstrip(),
-                                    stdin_encoding))
+        self.readline.add_history(source_raw.rstrip())
         return self.readline.get_current_history_length()
 
     def interact(self, display_banner=None):
@@ -498,7 +495,7 @@ def interact(self, display_banner=None):
         if display_banner is None:
             display_banner = self.display_banner
 
-        if isinstance(display_banner, py3compat.string_types):
+        if isinstance(display_banner, (str,)):
             self.show_banner(display_banner)
         elif display_banner:
             self.show_banner()
@@ -598,11 +595,9 @@ def raw_input(self, prompt=''):
         prompt : str, optional
           A string to be printed to prompt the user.
         """
-        # raw_input expects str, but we pass it unicode sometimes
-        prompt = py3compat.cast_bytes_py2(prompt)
 
         try:
-            line = py3compat.cast_unicode_py2(self.raw_input_original(prompt))
+            line = self.raw_input_original(prompt)
         except ValueError:
             warn("\n********\nYou or a %run:ed script called sys.stdin.close()"
                  " or sys.stdout.close()!\nExiting IPython!\n")