Move bpython._py3compat.is_main_thread to bpython.curtsiesfrontend.code

sebastinas · sebastinas · commit d4ce21e0ab66 · 2020-10-13T21:17:53.000+02:00
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -32,7 +32,6 @@
 
 
 import sys
-import threading
 
 py3 = sys.version_info[0] == 3
 
@@ -53,15 +52,3 @@ def try_decode(s, encoding):
             except UnicodeDecodeError:
                 return None
         return s
-
-
-if py3:
-
-    def is_main_thread():
-        return threading.main_thread() == threading.current_thread()
-
-
-else:
-
-    def is_main_thread():
-        return isinstance(threading.current_thread(), threading._MainThread)
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -14,13 +14,18 @@
 import signal
 import greenlet
 import logging
+import threading
 
-from bpython._py3compat import py3, is_main_thread
+from bpython._py3compat import py3
 from bpython.config import getpreferredencoding
 
 logger = logging.getLogger(__name__)
 
 
+def is_main_thread():
+    return threading.main_thread() == threading.current_thread()
+
+
 class SigintHappened(object):
     """If this class is returned, a SIGINT happened while the main greenlet"""
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -36,12 +36,12 @@
 from bpython.formatter import BPythonFormatter
 from bpython import autocomplete
 from bpython.translations import _
-from bpython._py3compat import py3, is_main_thread
+from bpython._py3compat import py3
 from bpython.pager import get_pager_command
 
 from bpython.curtsiesfrontend import replpainter as paint
 from bpython.curtsiesfrontend import sitefix
-from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
+from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput, is_main_thread
 from bpython.curtsiesfrontend.filewatch import ModuleChangedEventHandler
 from bpython.curtsiesfrontend.interaction import StatusBar
 from bpython.curtsiesfrontend.manual_readline import edit_keys
