From bba254f33991997747fcd4a239c2ef73d69070f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alban=20F=C3=A9ron?= <alban.feron@gmail.com>
Date: Sat, 16 Jan 2021 12:27:11 +0100
Subject: [PATCH] Import cleanup

---
 supysonic/api/__init__.py     | 10 +++++-----
 supysonic/api/albums_songs.py |  2 +-
 supysonic/api/annotation.py   |  2 +-
 supysonic/api/browse.py       |  2 +-
 supysonic/api/chat.py         |  2 +-
 supysonic/api/jukebox.py      |  2 +-
 supysonic/api/media.py        |  2 +-
 supysonic/api/playlists.py    |  2 +-
 supysonic/api/radio.py        |  2 +-
 supysonic/api/scan.py         |  2 +-
 supysonic/api/search.py       |  2 +-
 supysonic/api/system.py       |  2 +-
 supysonic/api/unsupported.py  |  3 +++
 supysonic/api/user.py         |  2 +-
 14 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/supysonic/api/__init__.py b/supysonic/api/__init__.py
index 1f0abe0..bbc0998 100644
--- a/supysonic/api/__init__.py
+++ b/supysonic/api/__init__.py
@@ -9,7 +9,6 @@ API_VERSION = "1.10.2"
 
 import binascii
 import uuid
-import functools
 from flask import request
 from flask import Blueprint
 from pony.orm import ObjectNotFound
@@ -26,13 +25,14 @@ api = Blueprint("api", __name__)
 
 def api_routing(endpoint):
     def decorator(func):
-        viewendpoint="{}.view".format(endpoint)
-        api.add_url_rule(endpoint,view_func=func, methods=["GET", "POST"])
-        api.add_url_rule(viewendpoint,view_func=func, methods=["GET", "POST"])
+        viewendpoint = "{}.view".format(endpoint)
+        api.add_url_rule(endpoint, view_func=func, methods=["GET", "POST"])
+        api.add_url_rule(viewendpoint, view_func=func, methods=["GET", "POST"])
         return func
+
     return decorator
 
-    
+
 @api.before_request
 def set_formatter():
     """Return a function to create the response."""
diff --git a/supysonic/api/albums_songs.py b/supysonic/api/albums_songs.py
index 6fa2f96..2fc5e58 100644
--- a/supysonic/api/albums_songs.py
+++ b/supysonic/api/albums_songs.py
@@ -21,7 +21,7 @@ from ..db import (
 )
 from ..db import now
 
-from . import api, api_routing
+from . import api_routing
 from .exceptions import GenericError, NotFound
 
 
diff --git a/supysonic/api/annotation.py b/supysonic/api/annotation.py
index 529aaae..d49c03a 100644
--- a/supysonic/api/annotation.py
+++ b/supysonic/api/annotation.py
@@ -16,7 +16,7 @@ from ..db import StarredTrack, StarredAlbum, StarredArtist, StarredFolder
 from ..db import RatingTrack, RatingFolder
 from ..lastfm import LastFm
 
-from . import api, get_entity, get_entity_id, api_routing
+from . import get_entity, get_entity_id, api_routing
 from .exceptions import AggregateException, GenericError, MissingParameter, NotFound
 
 
diff --git a/supysonic/api/browse.py b/supysonic/api/browse.py
index a3a649d..6e83c27 100644
--- a/supysonic/api/browse.py
+++ b/supysonic/api/browse.py
@@ -13,7 +13,7 @@ from pony.orm import ObjectNotFound, select, count
 
 from ..db import Folder, Artist, Album, Track
 
-from . import api, get_entity, get_entity_id, api_routing
+from . import get_entity, get_entity_id, api_routing
 
 
 @api_routing("/getMusicFolders")
diff --git a/supysonic/api/chat.py b/supysonic/api/chat.py
index 1f519d7..dbe5e24 100644
--- a/supysonic/api/chat.py
+++ b/supysonic/api/chat.py
@@ -8,7 +8,7 @@
 from flask import request
 
 from ..db import ChatMessage
-from . import api, api_routing
+from . import api_routing
 
 
 @api_routing("/getChatMessages")
diff --git a/supysonic/api/jukebox.py b/supysonic/api/jukebox.py
index 9269b2f..28a2255 100644
--- a/supysonic/api/jukebox.py
+++ b/supysonic/api/jukebox.py
@@ -14,7 +14,7 @@ from ..daemon import DaemonClient
 from ..daemon.exceptions import DaemonUnavailableError
 from ..db import Track
 
-from . import api, api_routing
+from . import api_routing
 from .exceptions import GenericError, MissingParameter, Forbidden
 
 
diff --git a/supysonic/api/media.py b/supysonic/api/media.py
index 32c6263..27d7be1 100644
--- a/supysonic/api/media.py
+++ b/supysonic/api/media.py
@@ -28,7 +28,7 @@ from zipstream import ZipFile
 from ..cache import CacheMiss
 from ..db import Track, Album, Folder, now
 
-from . import api, get_entity, get_entity_id, api_routing
+from . import get_entity, get_entity_id, api_routing
 from .exceptions import (
     GenericError,
     NotFound,
diff --git a/supysonic/api/playlists.py b/supysonic/api/playlists.py
index 46643c7..174a785 100644
--- a/supysonic/api/playlists.py
+++ b/supysonic/api/playlists.py
@@ -11,7 +11,7 @@ from flask import request
 
 from ..db import Playlist, User, Track
 
-from . import api, get_entity, api_routing
+from . import get_entity, api_routing
 from .exceptions import Forbidden, MissingParameter, NotFound
 
 
diff --git a/supysonic/api/radio.py b/supysonic/api/radio.py
index c4647c5..8b5aca6 100644
--- a/supysonic/api/radio.py
+++ b/supysonic/api/radio.py
@@ -9,7 +9,7 @@ from flask import request
 
 from ..db import RadioStation
 
-from . import api, get_entity, api_routing
+from . import get_entity, api_routing
 from .exceptions import Forbidden, MissingParameter
 
 
diff --git a/supysonic/api/scan.py b/supysonic/api/scan.py
index d0c704c..3e5ae95 100644
--- a/supysonic/api/scan.py
+++ b/supysonic/api/scan.py
@@ -12,7 +12,7 @@ from flask import current_app
 from ..daemon.client import DaemonClient
 from ..daemon.exceptions import DaemonUnavailableError
 
-from . import api, api_routing
+from . import api_routing
 from .user import admin_only
 from .exceptions import ServerError
 
diff --git a/supysonic/api/search.py b/supysonic/api/search.py
index d289d8a..18a0444 100644
--- a/supysonic/api/search.py
+++ b/supysonic/api/search.py
@@ -12,7 +12,7 @@ from pony.orm import select
 
 from ..db import Folder, Track, Artist, Album
 
-from . import api, api_routing
+from . import api_routing
 from .exceptions import MissingParameter
 
 
diff --git a/supysonic/api/system.py b/supysonic/api/system.py
index 0a0b440..8bea25d 100644
--- a/supysonic/api/system.py
+++ b/supysonic/api/system.py
@@ -8,7 +8,7 @@
 
 from flask import request
 
-from . import api, api_routing
+from . import api_routing
 
 
 @api_routing("/ping")
diff --git a/supysonic/api/unsupported.py b/supysonic/api/unsupported.py
index 99c0174..ee5a415 100644
--- a/supysonic/api/unsupported.py
+++ b/supysonic/api/unsupported.py
@@ -23,6 +23,9 @@ def unsupported():
 
 
 for m in methods:
+    api.add_url_rule(
+        "/{}".format(m), "unsupported", unsupported, methods=["GET", "POST"]
+    )
     api.add_url_rule(
         "/{}.view".format(m), "unsupported", unsupported, methods=["GET", "POST"]
     )
diff --git a/supysonic/api/user.py b/supysonic/api/user.py
index 18a402c..ace7c57 100644
--- a/supysonic/api/user.py
+++ b/supysonic/api/user.py
@@ -11,7 +11,7 @@ from functools import wraps
 from ..db import User
 from ..managers.user import UserManager
 
-from . import api, decode_password, api_routing
+from . import decode_password, api_routing
 from .exceptions import Forbidden, NotFound