less imports

po/remembrance.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: remembrance\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 13:38-0400\n"
+"POT-Creation-Date: 2023-05-01 15:02-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -449,11 +449,11 @@ msgstr ""
 #: src/browser/resources/ui/main_window.ui:408
 #: src/browser/resources/ui/move_reminders_window.ui:62
 #: src/browser/resources/ui/reminder_edit_window.ui:474
-#: src/browser/edit_lists_window.py:97 src/browser/edit_lists_window.py:202
+#: src/browser/edit_lists_window.py:96 src/browser/edit_lists_window.py:201
 #: src/browser/main_window.py:388 src/browser/main_window.py:1281
 #: src/browser/main_window.py:1296 src/browser/main_window.py:1315
 #: src/browser/main_window.py:1330 src/browser/main_window.py:1345
-#: src/browser/move_reminders_window.py:112 src/browser/preferences.py:275
+#: src/browser/move_reminders_window.py:111 src/browser/preferences.py:274
 #: src/browser/reminder.py:412
 msgid "Cancel"
 msgstr ""
@@ -541,7 +541,7 @@ msgid "Move"
 msgstr ""
 
 #: src/browser/resources/ui/main_window.ui:555
-#: src/browser/resources/ui/reminder.ui:83 src/browser/edit_lists_window.py:203
+#: src/browser/resources/ui/reminder.ui:83 src/browser/edit_lists_window.py:202
 #: src/browser/reminder.py:413
 msgid "Remove"
 msgstr ""
@@ -683,7 +683,7 @@ msgid "All"
 msgstr ""
 
 #: src/browser/resources/ui/preferences_user_row.ui:59
-#: src/browser/preferences.py:276
+#: src/browser/preferences.py:275
 msgid "Sign Out"
 msgstr ""
 
@@ -931,15 +931,15 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
-#: src/browser/application.py:55
+#: src/browser/application.py:56
 msgid "Print the version of the app"
 msgstr ""
 
-#: src/browser/application.py:62
+#: src/browser/application.py:63
 msgid "Restart service before starting app"
 msgstr ""
 
-#: src/browser/application.py:69
+#: src/browser/application.py:70
 msgid "Start on a different page"
 msgstr ""
 
@@ -961,34 +961,34 @@ msgid ""
 "out and log back in before using it. This is due to a bug in Flatpak."
 msgstr ""
 
-#: src/browser/edit_lists_window.py:23 src/browser/edit_lists_window.py:119
+#: src/browser/edit_lists_window.py:22 src/browser/edit_lists_window.py:118
 msgid "New List"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:94 src/browser/main_window.py:385
+#: src/browser/edit_lists_window.py:93 src/browser/main_window.py:385
 msgid "You have unsaved changes"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:95 src/browser/main_window.py:386
+#: src/browser/edit_lists_window.py:94 src/browser/main_window.py:386
 msgid "Are you sure you want to close the window?"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:98 src/browser/main_window.py:389
+#: src/browser/edit_lists_window.py:97 src/browser/main_window.py:389
 #: src/browser/main_window.py:1282 src/browser/main_window.py:1297
 #: src/browser/main_window.py:1316 src/browser/main_window.py:1331
-#: src/browser/main_window.py:1346 src/browser/move_reminders_window.py:113
+#: src/browser/main_window.py:1346 src/browser/move_reminders_window.py:112
 msgid "Yes"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:154
+#: src/browser/edit_lists_window.py:153
 msgid "What should the list be called?"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:198
+#: src/browser/edit_lists_window.py:197
 msgid "Remove list?"
 msgstr ""
 
-#: src/browser/edit_lists_window.py:199
+#: src/browser/edit_lists_window.py:198
 #, python-brace-format
 msgid "This will remove {list_name} and cannot be undone."
 msgstr ""
@@ -1185,15 +1185,15 @@ msgid ""
 "cannot be undone."
 msgstr ""
 
-#: src/browser/move_reminders_window.py:110
+#: src/browser/move_reminders_window.py:109
 msgid "Are you sure you want to move the currently selected reminder(s)?"
 msgstr ""
 
-#: src/browser/preferences.py:271
+#: src/browser/preferences.py:270
 msgid "Are you sure you want to sign out?"
 msgstr ""
 
-#: src/browser/preferences.py:272
+#: src/browser/preferences.py:271
 #, python-brace-format
 msgid "This will sign out <b>{self.username}</b>"
 msgstr ""
@@ -1225,14 +1225,14 @@ msgstr ""
 msgid "AM"
 msgstr ""
 
-#: src/service/backend.py:814
+#: src/service/backend.py:815
 msgid "Mark as completed"
 msgstr ""
 
-#: src/service/backend.py:1195
+#: src/service/backend.py:1196
 msgid "Local Reminders"
 msgstr ""
 
-#: src/service/backend.py:1857
+#: src/service/backend.py:1858
 msgid "Local"
 msgstr ""

src/browser/application.py

@@ -14,16 +14,14 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-import gi
 import logging
-import traceback
 
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
+from gi import require_version
+
+require_version('Gtk', '4.0')
+require_version('Adw', '1')
 
 from gi.repository import Gtk, Adw, GLib, Gio, Gdk
-from gettext import gettext as _
-from pkg_resources import parse_version
 
 from remembrance import info
 from remembrance.browser.error_dialog import ErrorDialog
@@ -33,6 +31,9 @@
 from remembrance.browser.shortcuts_window import ShortcutsWindow
 from remembrance.browser.export_lists_window import ExportListsWindow
 from remembrance.browser.import_lists_window import ImportListsWindow
+from gettext import gettext as _
+from pkg_resources import parse_version
+from traceback import format_exception
 
 # Always update this when new features are added that require the service to restart
 MIN_SERVICE_VERSION = '5.0.beta2'
@@ -109,8 +110,7 @@ def do_startup(self):
         self.refreshing = False
 
         if info.portals_enabled:
-            import gi
-            gi.require_version('Xdp', '1.0')
+            require_version('Xdp', '1.0')
             from gi.repository import Xdp
 
             portal = Xdp.Portal()
@@ -358,7 +358,7 @@ def run_service_method(self, method, parameters, sync = True, callback = None, r
                     None
                 )
         except GLib.GError as error:
-            error_text = ''.join(traceback.format_exception(error))
+            error_text = ''.join(format_exception(error))
             if 'The name is not activatable' in str(error):
                 if show_error_dialog:
                     if self.error_dialog is not None:

src/browser/caldav_sign_in.py

@@ -13,12 +13,11 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-
 from remembrance import info
 from gi.repository import Gtk, Adw, GLib
+from logging import getLogger
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/caldav_sign_in.ui')
 class CalDAVSignIn(Adw.Window):

src/browser/calendar.py

@@ -14,17 +14,17 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import threading
-import logging
-import time
 
 from gi.repository import GLib, Gio
 
 from remembrance import info
+from logging import getLogger
+from time import time
+from threading import Thread
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
-class Calendar(threading.Thread):
+class Calendar(Thread):
     '''Updates date labels when day changes'''
     def __init__(self, win):
         self.win = win
@@ -74,7 +74,7 @@ def run_countdown(self, new_day = True):
                 GLib.Source.remove(self.countdown_id)
                 self.countdown_id = 0
 
-            now = time.time()
+            now = time()
             wait = int(1000 * (self.timestamp - now))
             if wait > 0:
                 self.countdown_id = GLib.timeout_add(wait, self.on_countdown_done)

src/browser/dnd_reminder.py

@@ -14,7 +14,6 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from gi.repository import Gtk, Adw
-from gettext import gettext as _
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/dnd_reminder.ui')
 class DNDReminder(Adw.ActionRow):

src/browser/edit_lists_window.py

@@ -13,16 +13,15 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-
 from gi.repository import Gtk, Adw
 from gettext import gettext as _
 
 from remembrance import info
+from logging import getLogger
 
 DEFAULT_LIST_TITLE = _('New List')
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/edit_lists_window.ui')
 class EditListsWindow(Adw.Window):

src/browser/export_lists_window.py

@@ -13,14 +13,13 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-
 from gi.repository import Gtk, Adw, GLib, Gio
 from gettext import gettext as _
 
 from remembrance import info
+from logging import getLogger
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
 class ListRow(Adw.ActionRow):
     def __init__(self, *args, **kwargs):

src/browser/import_lists_window.py

@@ -13,16 +13,14 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-import traceback
-
 from gi.repository import Gtk, Adw, GLib
 from gettext import gettext as _
-
 from remembrance import info
 from remembrance.browser.error_dialog import ErrorDialog
+from traceback import format_exception
+from logging import getLogger
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/import_lists_window.ui')
 class ImportListsWindow(Adw.Window):
@@ -56,7 +54,7 @@ def do_save(self):
             self.app.run_service_method('ImportLists', GLib.Variant('(ass)', (self.files, task_list)), show_error_dialog=False)
             self.close()
         except Exception as error:
-            error_text = ''.join(traceback.format_exception(error))
+            error_text = ''.join(format_exception(error))
             logger.exception(error)
             self.app.error_dialog = ErrorDialog(self, _("Couldn't import lists"), _('Check that you are importing a valid iCalendar file.'), error_text, parent_window=self)
 

src/browser/main_window.py

@@ -14,26 +14,26 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
-import time
-import gi
-import logging
 
-gi.require_version('Gtk', '4.0')
-gi.require_version('Adw', '1')
+from gi import require_version
+require_version('Gtk', '4.0')
+require_version('Adw', '1')
 
 from gi.repository import Gtk, Adw, GLib, Gio, GObject, Gdk
-from gettext import gettext as _
-from difflib import SequenceMatcher
-from math import floor, ceil
 
 from remembrance import info
 from remembrance.browser.reminder import Reminder
 from remembrance.browser.calendar import Calendar
 from remembrance.browser.edit_lists_window import EditListsWindow
 from remembrance.browser.reminder_edit_window import ReminderEditWindow
 from remembrance.browser.move_reminders_window import MoveRemindersWindow
+from time import time, strftime
+from logging import getLogger
+from gettext import gettext as _
+from difflib import SequenceMatcher
+from math import floor, ceil
 
-logger = logging.getLogger(info.app_executable)
+logger = getLogger(info.app_executable)
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/task_list_row.ui')
 class TaskListRow(Gtk.ListBoxRow):
@@ -472,7 +472,7 @@ def get_repeat_label(self, repeat_type, repeat_frequency, repeat_days, repeat_un
     def set_time_format(self):
         setting = self.app.settings.get_enum('time-format')
         if setting == 0:
-            if time.strftime('%p'):
+            if strftime('%p'):
                 self.set_twelve_hour()
             else:
                 self.set_twentyfour_hour()
@@ -920,7 +920,7 @@ def all_filter(self, reminder, list_id = None, just_filter = False):
         return retval
 
     def upcoming_filter(self, reminder, list_id = None, just_filter = False):
-        now = floor(time.time())
+        now = floor(time())
         if (reminder.options['timestamp'] == 0 or reminder.options['timestamp'] > now) and not reminder.completed:
             retval = self.task_list_filter(reminder, list_id)
         else:
@@ -933,7 +933,7 @@ def upcoming_filter(self, reminder, list_id = None, just_filter = False):
         return retval
 
     def past_filter(self, reminder, list_id = None, just_filter = False):
-        now = ceil(time.time())
+        now = ceil(time())
         if not reminder.completed and ((reminder.options['timestamp'] != 0 and reminder.options['timestamp'] < now) or \
         (reminder.options['due-date'] != 0 and datetime.datetime.fromtimestamp(reminder.options['due-date'], tz=datetime.timezone.utc).date() < datetime.date.today())):
             retval = self.task_list_filter(reminder, list_id)

src/browser/microsoft_sign_in.py

@@ -13,15 +13,16 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 import gi
 
 from remembrance import info
 
 gi.require_version('WebKit', '6.0')
 from gi.repository import Gtk, Adw, WebKit
 
-logger = logging.getLogger(info.app_executable)
+from logging import getLogger
+
+logger = getLogger(info.app_executable)
 
 @Gtk.Template(resource_path='/io/github/dgsasha/remembrance/ui/microsoft_sign_in.ui')
 class MicrosoftSignIn(Adw.Window):