Change some Query.get() into Session.get() calls

See #310 — sqlalchemy-2.0 migration
sde1000 · Jan 18, 2025 · 3e7d00e · 3e7d00e
1 parent d6ea78b
commit 3e7d00e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/quicktill/config.py b/quicktill/config.py
@@ -79,7 +79,7 @@ def preload(cls):
             ci._read()
 
     def _read(self):
-        d = td.s.query(Config).get(self.key)
+        d = td.s.get(Config, self.key)
         if d is None:
             # The config option doesn't exist in the database. Initialise it
             # with the default.
@@ -257,7 +257,7 @@ def run(args):
                 for ci in td.s.query(Config).order_by(Config.key).all():
                     print(f"{ci.key}: {ci.display_name}: {ci.value}")
                 return
-            ci = td.s.query(Config).get(args.key)
+            ci = td.s.get(Config, args.key)
             if not ci:
                 print(f"Config key {args.key} does not exist")
                 return 1

diff --git a/quicktill/keyboard.py b/quicktill/keyboard.py
@@ -66,15 +66,15 @@ def name(self):
     @property
     def keycap(self):
         from . import td, models
-        cap = td.s.query(models.KeyCap).get(self.name)
+        cap = td.s.get(models.KeyCap, self.name)
         if cap:
             return cap.keycap
         return ""
 
     @property
     def css_class(self):
         from . import td, models
-        cap = td.s.query(models.KeyCap).get(self.name)
+        cap = td.s.get(models.KeyCap, self.name)
         if cap:
             return cap.css_class