Fixed antipattern

- Remove unnecessary return statement
- Remove unnecessary `del` statement from local scope
- Consider merging the comparisons with 'in'

supysonic/api/annotation.py

@@ -51,7 +51,6 @@ def unstar_single(cls, starcls, eid):
     """
 
     delete(s for s in starcls if s.user.id == request.user.id and s.starred.id == eid)
-    return None
 
 
 def handle_star_request(func):

supysonic/scanner.py

@@ -393,7 +393,7 @@ class Scanner(Thread):
         children = []
         drive, _ = os.path.splitdrive(path)
         path = os.path.dirname(path)
-        while path != drive and path != "/":
+        while path not in (drive, "/"):
             folder = Folder.get(path=path)
             if folder is not None:
                 break

supysonic/watcher.py

@@ -166,7 +166,6 @@ class ScannerProcessingQueue(Thread):
 
             scanner.prune()
             logger.debug("Freeing scanner")
-            del scanner
 
     def __process_regular_item(self, scanner, item):
         if item.operation & OP_MOVE:

tests/api/test_playlist.py

@@ -67,12 +67,8 @@ class PlaylistTestCase(ApiTestBase):
             "getPlaylists", {"u": "bob", "p": "B0b"}, tag="playlists"
         )
         self.assertEqual(len(child), 2)
-        self.assertTrue(
+        self.assertTrue("alice" in (child[0].get("owner"), child[1].get("owner")))
-            child[0].get("owner") == "alice" or child[1].get("owner") == "alice"
+        self.assertTrue("bob" in (child[0].get("owner"), child[1].get("owner")))
-        )
-        self.assertTrue(
-            child[0].get("owner") == "bob" or child[1].get("owner") == "bob"
-        )
         self.assertIsNotNone(
             self._find(child, "./playlist[@owner='alice'][@public='true']")
         )
@@ -122,7 +118,7 @@ class PlaylistTestCase(ApiTestBase):
         self.assertEqual(child.get("duration"), "4")
         self.assertEqual(child[0].get("title"), "One")
         self.assertTrue(
-            child[1].get("title") == "Two" or child[1].get("title") == "Three"
+            child[1].get("title") in ("Two", "Three")
         )  # depending on 'getPlaylists' result ordering
 
     def test_create_playlist(self):

tests/issue133.py

@@ -34,7 +34,6 @@ class Issue133TestCase(unittest.TestCase):
         scanner = Scanner()
         scanner.queue_folder("folder")
         scanner.run()
-        del scanner
 
         track = Track.select().first()
         self.assertNotIn("\x00", track.title)

tests/issue139.py

@@ -32,7 +32,6 @@ class Issue139TestCase(unittest.TestCase):
         scanner = Scanner()
         scanner.queue_folder("folder")
         scanner.run()
-        del scanner
 
     def test_null_genre(self):
         shutil.copy("tests/assets/issue139.mp3", self.__dir)

tests/issue148.py

@@ -40,7 +40,6 @@ class Issue148TestCase(unittest.TestCase):
         scanner = Scanner()
         scanner.queue_folder("folder")
         scanner.run()
-        del scanner
 
 
 if __name__ == "__main__":