Move util import to be consistent with other imports from util.

Author: semohr

beets/ui/commands/config.py

@@ -2,7 +2,8 @@
 
 import os
 
-from beets import config, ui, util
+from beets import config, ui
+from beets.util import displayable_path, editor_command, interactive_open
 
 
 def config_func(lib, opts, args):
@@ -25,7 +26,7 @@ def config_func(lib, opts, args):
             filenames.insert(0, user_path)
 
         for filename in filenames:
-            ui.print_(util.displayable_path(filename))
+            ui.print_(displayable_path(filename))
 
     # Open in editor.
     elif opts.edit:
@@ -45,11 +46,11 @@ def config_edit():
     An empty config file is created if no existing config file exists.
     """
     path = config.user_config_path()
-    editor = util.editor_command()
+    editor = editor_command()
     try:
         if not os.path.isfile(path):
             open(path, "w+").close()
-        util.interactive_open([path], editor)
+        interactive_open([path], editor)
     except OSError as exc:
         message = f"Could not edit configuration: {exc}"
         if not editor:

beets/ui/commands/move.py

@@ -2,7 +2,14 @@
 
 import os
 
-from beets import logging, ui, util
+from beets import logging, ui
+from beets.util import (
+    MoveOperation,
+    PathLike,
+    displayable_path,
+    normpath,
+    syspath,
+)
 
 from ._utils import do_query
 
@@ -28,8 +35,8 @@ def show_path_changes(path_changes):
     sources, destinations = zip(*path_changes)
 
     # Ensure unicode output
-    sources = list(map(util.displayable_path, sources))
-    destinations = list(map(util.displayable_path, destinations))
+    sources = list(map(displayable_path, sources))
+    destinations = list(map(displayable_path, destinations))
 
     # Calculate widths for terminal split
     col_width = (ui.term_width() - len(" -> ")) // 2
@@ -53,7 +60,7 @@ def show_path_changes(path_changes):
 
 def move_items(
     lib,
-    dest_path: util.PathLike,
+    dest_path: PathLike,
     query,
     copy,
     album,
@@ -128,24 +135,22 @@ def isalbummoved(album):
             if export:
                 # Copy without affecting the database.
                 obj.move(
-                    operation=util.MoveOperation.COPY, basedir=dest, store=False
+                    operation=MoveOperation.COPY, basedir=dest, store=False
                 )
             else:
                 # Ordinary move/copy: store the new path.
                 if copy:
-                    obj.move(operation=util.MoveOperation.COPY, basedir=dest)
+                    obj.move(operation=MoveOperation.COPY, basedir=dest)
                 else:
-                    obj.move(operation=util.MoveOperation.MOVE, basedir=dest)
+                    obj.move(operation=MoveOperation.MOVE, basedir=dest)
 
 
 def move_func(lib, opts, args):
     dest = opts.dest
     if dest is not None:
-        dest = util.normpath(dest)
-        if not os.path.isdir(util.syspath(dest)):
-            raise ui.UserError(
-                f"no such directory: {util.displayable_path(dest)}"
-            )
+        dest = normpath(dest)
+        if not os.path.isdir(syspath(dest)):
+            raise ui.UserError(f"no such directory: {displayable_path(dest)}")
 
     move_items(
         lib,

test/ui/commands/test_update.py

@@ -2,11 +2,11 @@
 
 from mediafile import MediaFile
 
-from beets import library, util
+from beets import library
 from beets.test import _common
 from beets.test.helper import BeetsTestCase, IOMixin
 from beets.ui.commands.update import update_items
-from beets.util import MoveOperation, syspath
+from beets.util import MoveOperation, remove, syspath
 
 
 class UpdateTest(IOMixin, BeetsTestCase):
@@ -29,7 +29,7 @@ def setUp(self):
         _common.touch(artfile)
         self.album.set_art(artfile)
         self.album.store()
-        util.remove(artfile)
+        remove(artfile)
 
     def _update(
         self,
@@ -56,23 +56,23 @@ def _update(
 
     def test_delete_removes_item(self):
         assert list(self.lib.items())
-        util.remove(self.i.path)
-        util.remove(self.i2.path)
+        remove(self.i.path)
+        remove(self.i2.path)
         self._update()
         assert not list(self.lib.items())
 
     def test_delete_removes_album(self):
         assert self.lib.albums()
-        util.remove(self.i.path)
-        util.remove(self.i2.path)
+        remove(self.i.path)
+        remove(self.i2.path)
         self._update()
         assert not self.lib.albums()
 
     def test_delete_removes_album_art(self):
         art_filepath = self.album.art_filepath
         assert art_filepath.exists()
-        util.remove(self.i.path)
-        util.remove(self.i2.path)
+        remove(self.i.path)
+        remove(self.i2.path)
         self._update()
         assert not art_filepath.exists()