Remove no longer used encoding

sebastinas · sebastinas · commit a808521ad830 · 2022-05-04T00:11:32.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -2005,7 +2005,7 @@ def main_curses(
     curses.raw(True)
     main_win, statusbar = init_wins(scr, config)
 
-    interpreter = repl.Interpreter(locals_, getpreferredencoding())
+    interpreter = repl.Interpreter(locals_)
 
     clirepl = CLIRepl(main_win, interpreter, statusbar, config, idle)
     clirepl._C = cols
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -63,14 +63,13 @@ class Interp(ReplInterpreter):
     def __init__(
         self,
         locals: Optional[Dict[str, Any]] = None,
-        encoding: Optional[str] = None,
     ) -> None:
         """Constructor.
 
         We include an argument for the outfile to pass to the formatter for it
         to write to.
         """
-        super().__init__(locals, encoding)
+        super().__init__(locals)
 
         # typically changed after being instantiated
         # but used when interpreter used corresponding REPL
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -110,9 +110,8 @@ class Interpreter(code.InteractiveInterpreter):
 
     def __init__(
         self,
-        locals: Optional[MutableMapping[str, str]] = None,
-        encoding: Optional[str] = None,
-    ):
+        locals: Optional[MutableMapping[str, Any]] = None,
+    ) -> None:
         """Constructor.
 
         The optional 'locals' argument specifies the dictionary in which code
@@ -126,14 +125,8 @@ def __init__(
         callback can be added to the Interpreter instance afterwards - more
         specifically, this is so that autoindentation does not occur after a
         traceback.
-
-        encoding is only used in Python 2, where it may be necessary to add an
-        encoding comment to a source bytestring before running it.
-        encoding must be a bytestring in Python 2 because it will be templated
-        into a bytestring source as part of an encoding comment.
         """
 
-        self.encoding = encoding or getpreferredencoding()
         self.syntaxerror_callback: Optional[Callable] = None
 
         if locals is None:
@@ -145,36 +138,21 @@ def __init__(
         super().__init__(locals)
         self.timer = RuntimeTimer()
 
-    def runsource(self, source, filename=None, symbol="single", encode="auto"):
+    def runsource(
+        self,
+        source: str,
+        filename: Optional[str] = None,
+        symbol: str = "single",
+    ) -> bool:
         """Execute Python code.
 
         source, filename and symbol are passed on to
-        code.InteractiveInterpreter.runsource. If encode is True,
-        an encoding comment will be added to the source.
-        On Python 3.X, encode will be ignored.
-
-        encode should only be used for interactive interpreter input,
-        files should always already have an encoding comment or be ASCII.
-        By default an encoding line will be added if no filename is given.
-
-        source must be a string
-
-        Because adding an encoding comment to a unicode string in Python 2
-        would cause a syntax error to be thrown which would reference code
-        the user did not write, setting encoding to True when source is a
-        unicode string in Python 2 will throw a ValueError."""
-        if encode and filename is not None:
-            # files have encoding comments or implicit encoding of ASCII
-            if encode != "auto":
-                raise ValueError("shouldn't add encoding line to file contents")
-            encode = False
+        code.InteractiveInterpreter.runsource."""
 
         if filename is None:
             filename = filename_for_console_input(source)
         with self.timer:
-            return code.InteractiveInterpreter.runsource(
-                self, source, filename, symbol
-            )
+            return super().runsource(source, filename, symbol)
 
     def showsyntaxerror(self, filename=None):
         """Override the regular handler, the code's copied and pasted from
@@ -532,7 +510,7 @@ def startup(self) -> None:
             encoding = inspection.get_encoding_file(filename)
             with open(filename, encoding=encoding) as f:
                 source = f.read()
-                self.interp.runsource(source, filename, "exec", encode=False)
+                self.interp.runsource(source, filename, "exec")
 
     def current_string(self, concatenate=False):
         """If the line ends in a string get it, otherwise return ''"""
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -38,7 +38,7 @@ def test_syntaxerror(self):
         if (3, 10, 1) <= sys.version_info[:3]:
             expected = (
                 "  File "
-                + green('"<bpython-input-148>"')
+                + green('"<bpython-input-147>"')
                 + ", line "
                 + bold(magenta("1"))
                 + "\n    1.1.1.1\n       ^^\n"
@@ -50,7 +50,7 @@ def test_syntaxerror(self):
         elif (3, 10) <= sys.version_info[:2]:
             expected = (
                 "  File "
-                + green('"<bpython-input-148>"')
+                + green('"<bpython-input-147>"')
                 + ", line "
                 + bold(magenta("1"))
                 + "\n    1.1.1.1\n    ^^^^^\n"
@@ -129,13 +129,6 @@ def gfunc():
         self.assertMultiLineEqual(str(plain("").join(a)), str(expected))
         self.assertEqual(plain("").join(a), expected)
 
-    def test_runsource_bytes_over_128_syntax_error_py3(self):
-        i = interpreter.Interp(encoding="latin-1")
-        i.showsyntaxerror = mock.Mock(return_value=None)
-
-        i.runsource("a = b'\xfe'")
-        i.showsyntaxerror.assert_called_with(mock.ANY)
-
     def test_getsource_works_on_interactively_defined_functions(self):
         source = "def foo(x):\n    return x + 1\n"
         i = interpreter.Interp()
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1243,7 +1243,7 @@ def options_callback(group):
         extend_locals["service"] = serv
         reactor.callWhenRunning(serv.startService)
         exec_args = []
-    interpreter = repl.Interpreter(locals_, locale.getpreferredencoding())
+    interpreter = repl.Interpreter(locals_)
     # TODO: replace with something less hack-ish
     interpreter.locals.update(extend_locals)
 
