From 4ebfc12f0e1031c0fbc3e90ddc1dd09f699501ba Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Mon, 27 May 2024 18:33:59 +0200
Subject: [PATCH] Fix import statements and order (see #103)

---
 src/albumheaderbar.py  | 1 -
 src/application.py     | 2 +-
 src/connectionpanel.py | 6 ++----
 src/coverpanel.py      | 4 +---
 src/librarypanel.py    | 5 ++---
 src/playlistpanel.py   | 6 ++----
 src/serverpanel.py     | 1 -
 src/utils.py           | 4 +---
 src/window.py          | 9 +++------
 src/zeroconf.py        | 2 +-
 10 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py
index 2a8a7e1..2f0b40b 100644
--- a/src/albumheaderbar.py
+++ b/src/albumheaderbar.py
@@ -4,7 +4,6 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-
 from gi.repository import Gtk, GObject, Adw
 
 
diff --git a/src/application.py b/src/application.py
index 187793e..23f482e 100644
--- a/src/application.py
+++ b/src/application.py
@@ -5,7 +5,7 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-from gi.repository import Gio, Gtk, Gdk, GLib, Adw
+from gi.repository import Gio, Gtk, Gdk, Adw
 from .window import Window
 
 
diff --git a/src/connectionpanel.py b/src/connectionpanel.py
index 4286e6a..a4060ed 100644
--- a/src/connectionpanel.py
+++ b/src/connectionpanel.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
+import locale
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-import locale
-
-from gi.repository import Gtk, Gio, GObject, Adw
-
+from gi.repository import Gtk, GObject, Adw
 from mcg.zeroconf import ZeroconfProvider
 
 
diff --git a/src/coverpanel.py b/src/coverpanel.py
index 9ac970b..88988b5 100644
--- a/src/coverpanel.py
+++ b/src/coverpanel.py
@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-import logging
 import math
 
+gi.require_version('Gtk', '4.0')
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
 from mcg.utils import Utils
 
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 27f8e60..8027620 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
 import locale
 import logging
 import math
 import threading
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
diff --git a/src/playlistpanel.py b/src/playlistpanel.py
index dc5e3e5..02526e0 100644
--- a/src/playlistpanel.py
+++ b/src/playlistpanel.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
-import logging
 import math
 import threading
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw
 from mcg import client
 from mcg.albumheaderbar import AlbumHeaderbar
diff --git a/src/serverpanel.py b/src/serverpanel.py
index e52e45d..be7bd97 100644
--- a/src/serverpanel.py
+++ b/src/serverpanel.py
@@ -4,7 +4,6 @@ import gi
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
-
 from gi.repository import Gtk, Adw, GObject
 
 
diff --git a/src/utils.py b/src/utils.py
index 1b16308..1a9e6e7 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,13 +1,11 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
 import hashlib
 import locale
 import os
-import urllib
 
+gi.require_version('Gtk', '4.0')
 from gi.repository import Gdk, GdkPixbuf, GObject, Gtk
 
 
diff --git a/src/window.py b/src/window.py
index 2024894..1c6d25c 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1,20 +1,17 @@
 #!/usr/bin/env python3
 
 import gi
-
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
 try:
     import keyring
     use_keyring = True
-except:
+except ImportError:
     use_keyring = False
 use_keyring = False
 import locale
-import logging
 
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio
-
 from . import client
 from .shortcutsdialog import ShortcutsDialog
 from .connectionpanel import ConnectionPanel
diff --git a/src/zeroconf.py b/src/zeroconf.py
index cdb0bd2..5fa3363 100644
--- a/src/zeroconf.py
+++ b/src/zeroconf.py
@@ -5,7 +5,7 @@ try:
     gi.require_version('Avahi', '0.6')
     from gi.repository import Avahi
     use_avahi = True
-except:
+except ValueError | ImportError:
     use_avahi = False
 import logging