fix test_raw_input

Author: blueyed

pyrepl/readline.py

@@ -205,9 +205,13 @@ def raw_input(self, prompt=''):
         except _error:
             return _old_raw_input(prompt)
         reader.ps1 = prompt
+
+        ret = reader.readline(startup_hook=self.startup_hook)
+        if sys.version_info < (3, ):
+            return ret
         # Unicode/str is required for Python 3 (3.5.2).
-        return unicode(reader.readline(startup_hook=self.startup_hook),
-                       ENCODING)
+        # Ref: https://bitbucket.org/pypy/pyrepl/issues/20/#comment-30647029
+        return unicode(ret, ENCODING)
 
     def multiline_input(self, more_lines, ps1, ps2, returns_unicode=False):
         """Read an input on possibly multiple lines, asking for more

testing/test_readline.py

@@ -5,7 +5,7 @@
 
 if sys.version_info < (3, ):
     bytes_type = str
-    unicode_type = unicode
+    unicode_type = unicode  # noqa: F821
 else:
     bytes_type = bytes
     unicode_type = str
@@ -37,5 +37,9 @@ def test_raw_input():
     os.write(master, b'input\n')
 
     result = readline_wrapper.raw_input('prompt:')
-    assert result == b'input'
-    assert isinstance(result, bytes_type)
+    if sys.version_info < (3, ):
+        assert result == b'input'
+        assert isinstance(result, bytes_type)
+    else:
+        assert result == 'input'
+        assert isinstance(result, unicode_type)