From 8807f1c2d3bd0294f9cb61da8031323c35786ee1 Mon Sep 17 00:00:00 2001
From: Mark Liffiton <liffiton@gmail.com>
Date: Fri, 26 Jul 2024 11:08:36 -0500
Subject: [PATCH] Fix deprecation/removal warning.

---
 src/gened/migrate.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gened/migrate.py b/src/gened/migrate.py
index 7bcea7b..539f77f 100644
--- a/src/gened/migrate.py
+++ b/src/gened/migrate.py
@@ -6,10 +6,14 @@
 from collections.abc import Iterable
 from datetime import datetime
 from importlib import resources
-from importlib.abc import Traversable
 from pathlib import Path
 from typing import TypedDict
 
+try:
+    from importlib.resources.abc import Traversable  # 3.12+
+except ImportError:
+    from importlib.abc import Traversable  # - Deprecated in 3.12, removed in 3.14
+
 import click
 from flask import current_app
 from flask.app import Flask
@@ -19,7 +23,6 @@
 
 class MigrationDict(TypedDict):
     name: str
-    path: Path
     contents: str
     mtime: float
     applied_on: str | None
@@ -94,7 +97,6 @@ def _migration_info(resource: Traversable) -> MigrationDict:
         name = path.name
         info: MigrationDict = {
             'name': name,
-            'path': path,
             'contents': f.read(),
             'mtime': path.stat().st_mtime,
             'applied_on': None,
@@ -114,14 +116,14 @@ def _get_migrations() -> list[MigrationDict]:
     # Pull shared Gen-ed migrations and app-specific migrations
     gened_migrations = resources.files('gened').joinpath("migrations")
     app_migrations = resources.files(current_app.name).joinpath("migrations")
-    migration_files = itertools.chain(
+    migration_resources = itertools.chain(
         *(x.iterdir() for x in (gened_migrations, app_migrations) if x.is_dir())
     )
 
     # Collect info and sort by name and modified time (to apply migrations in order)
     migrations = [
         _migration_info(res)
-        for res in migration_files
+        for res in migration_resources
         if not res.name.startswith('.') and res.name.endswith('.sql')
     ]
     migrations.sort(key=lambda x: (x['name'], x['mtime']))