Make config non-optional

sebastinas · sebastinas · commit 39e75dc51742 · 2021-01-01T14:45:06.000+01:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -53,8 +53,8 @@ def __init__(self, config, locals_, banner, interp=None):
             pass  # temp hack to get .original_stty
 
         super().__init__(
+            config,
             locals_=locals_,
-            config=config,
             banner=banner,
             interp=interp,
             orig_tcattrs=self.input_generator.original_stty,
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -27,12 +27,7 @@
 import bpython
 from bpython.repl import Repl as BpythonRepl, SourceNotFound
 from bpython.repl import LineTypeTranslator as LineType
-from bpython.config import (
-    Struct,
-    loadini,
-    default_config_path,
-    getpreferredencoding,
-)
+from bpython.config import getpreferredencoding, default_config_path
 from bpython.formatter import BPythonFormatter
 from bpython import autocomplete
 from bpython.translations import _
@@ -310,8 +305,8 @@ class BaseRepl(BpythonRepl):
 
     def __init__(
         self,
+        config,
         locals_=None,
-        config=None,
         banner=None,
         interp=None,
         orig_tcattrs=None,
@@ -326,10 +321,6 @@ def __init__(
 
         logger.debug("starting init")
 
-        if config is None:
-            config = Struct()
-            loadini(config, default_config_path())
-
         # If creating a new interpreter on undo would be unsafe because initial
         # state was passed in
         self.weak_rewind = bool(locals_ or interp)
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -233,7 +233,7 @@ def captured_output():
 
 def create_repl(**kwargs):
     config = setup_config({"editor": "true"})
-    repl = curtsiesrepl.BaseRepl(config=config, **kwargs)
+    repl = curtsiesrepl.BaseRepl(config, **kwargs)
     os.environ["PAGER"] = "true"
     os.environ.pop("PYTHONSTARTUP", None)
     repl.width = 50
diff --git a/doc/sphinx/source/simplerepl.py b/doc/sphinx/source/simplerepl.py
@@ -27,10 +27,11 @@
 import time
 import logging
 
-from . import translations
-from .curtsiesfrontend import events as bpythonevents
-from .curtsiesfrontend.repl import BaseRepl
-from .importcompletion import ModuleGatherer
+from bpython import translations
+from bpython.config import Struct, loadini, default_config_path
+from bpython.curtsiesfrontend import events as bpythonevents
+from bpython.curtsiesfrontend.repl import BaseRepl
+from bpython.importcompletion import ModuleGatherer
 
 from curtsies.configfile_keynames import keymap as key_dispatch
 
@@ -39,9 +40,9 @@
 
 
 class SimpleRepl(BaseRepl):
-    def __init__(self):
+    def __init__(self, config):
         self.requested_events = []
-        BaseRepl.__init__(self)
+        BaseRepl.__init__(self, config)
 
     def _request_refresh(self):
         self.requested_events.append(bpythonevents.RefreshRequestEvent())
@@ -116,10 +117,12 @@ def get_input(self):
 
 def main(args=None, locals_=None, banner=None):
     translations.init()
+    config = Struct()
+    loadini(config, default_config_path())
     module_gatherer = ModuleGatherer()
     while module_gatherer.find_coroutine():
         pass
-    with SimpleRepl() as r:
+    with SimpleRepl(config) as r:
         r.width = 50
         r.height = 10
         while True:
