Only import modules, not classes from modules

countdown/applicationwindow.py

@@ -4,9 +4,7 @@
 
 from gi.repository import Adw, GObject, Gtk
 
-from .digitalclock import DigitalClock
-from .countdownlabel import CountdownLabel
-from .timepopover import TimePopover
+from countdown import countdownlabel, digitalclock, timepopover
 
 
 @Gtk.Template(resource_path="/uk/me/bcowan/Countdown/ui/countdown.ui")
@@ -19,12 +17,12 @@ class ApplicationWindow(Gtk.ApplicationWindow):
     def __init__(self, app: Gtk.Application):
         super().__init__(application=app)
 
-        set_time_popover = TimePopover()
+        set_time_popover = timepopover.TimePopover()
         self._set_time_button.props.popover = set_time_popover
 
-        self._clock = DigitalClock()
+        self._clock = digitalclock.DigitalClock()
         self._main_box.append(self._clock)
-        self._count = CountdownLabel()
+        self._count = countdownlabel.CountdownLabel()
         self._main_box.append(self._count)
 
         set_time_popover.bind_property(

countdown/countdown.in

 #!@PYTHON@
 
-# SPDX-FileCopyrightText: 2018 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2018-2022 Bruce Cowan <bruce@bcowan.me.uk>
+#
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
 import os
 import sys
 import signal
-import gettext
 
 pkgdatadir = "@pkgdatadir@"
 
 sys.path.insert(1, pkgdatadir)
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
+
 if __name__ == "__main__":
     import gi
 

countdown/main.py

@@ -7,26 +7,22 @@ from __future__ import annotations
 import sys
 
 import gi
-
 gi.require_version("Adw", "1")
 gi.require_version("Gdk", "4.0")
 gi.require_version("Gtk", "4.0")
 from gi.repository import Adw, Gio, GLib, Gtk
 
-from .aboutdialog import AboutDialog
-from .applicationwindow import ApplicationWindow
-
-Adw.init()
+from countdown import aboutdialog, applicationwindow
 
 
 class Application(Adw.Application):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(application_id="uk.me.bcowan.Countdown")
 
     def do_activate(self) -> None:
         win = self.props.active_window
         if not win:
-            win = ApplicationWindow(self)
+            win = applicationwindow.ApplicationWindow(self)
 
         win.show()
 
@@ -37,8 +33,8 @@ class Application(Adw.Application):
         about_action.connect("activate", self._on_about)
         self.add_action(about_action)
 
-    def _on_about(self, action: Gio.SimpleAction, param: GLib.Variant | None):
-        dialogue = AboutDialog()
+    def _on_about(self, action: Gio.SimpleAction, param: GLib.Variant | None) -> None:
+        dialogue = aboutdialog.AboutDialog()
         dialogue.props.transient_for = self.props.active_window
         dialogue.show()