Fix up import errors

choreographer/__init__.py

@@ -6,25 +6,25 @@
 as a building block.
 """
 
-from ._browser_sync import (  # noqa: F401 unused import
-    BrowserSync,
-    SessionSync,
-    TabSync,
-    TargetSync,
-)
 from ._browsers import (  # noqa: F401 unused import
     BrowserClosedError,
     BrowserFailedError,
     Chromium,
 )
 from ._channels import BlockWarning, ChannelClosedError  # noqa: F401 unused import
-from ._cli_utils import get_browser, get_browser_sync  # noqa: F401 unused import
+from ._cli_utils import get_chrome, get_chrome_sync  # noqa: F401 unused import
 from ._sys_utils import (  # noqa: F401 unused import
     TmpDirectory,
     TmpDirWarning,
     browser_which,
     get_browser_path,
 )
+from .browser_sync import (  # noqa: F401 unused import
+    BrowserSync,
+    SessionSync,
+    TabSync,
+    TargetSync,
+)
 
 _sync_api = [
     "BrowserSync",
@@ -46,8 +46,8 @@
 ]
 
 _utils = [
-    "get_browser",
-    "get_browser_sync",
+    "get_chrome",
+    "get_chrome_sync",
     "TmpDirectory",
     "browser_which",
     "get_browser_path",

choreographer/_brokers/_sync.py

@@ -2,8 +2,7 @@
 from threading import Thread
 
 from choreographer import protocol
-
-from ._channels import ChannelClosedError
+from choreographer._channels import ChannelClosedError
 
 
 class BrokerSync:

choreographer/_channels/_wire.py

@@ -1,5 +1,6 @@
 import simplejson
-from channel._errors import JSONError
+
+from ._errors import JSONError
 
 
 class MultiEncoder(simplejson.JSONEncoder):

choreographer/_channels/pipe.py

@@ -4,8 +4,8 @@
 import warnings
 from threading import Lock
 
-import channel._wire as wire
-from channel._errors import BlockWarning, ChannelClosedError, JSONError
+from . import _wire as wire
+from ._errors import BlockWarning, ChannelClosedError, JSONError
 
 _with_block = bool(sys.version_info[:3] >= (3, 12) or platform.system() != "Windows")
 

choreographer/_sys_utils/__init__.py

@@ -1,4 +1,4 @@
-from ._kill.py import kill
+from ._kill import kill
 from ._tmpfile import TmpDirectory, TmpDirWarning
 from ._which import browser_which, get_browser_path