28 lines
882 B
Diff
28 lines
882 B
Diff
|
From d18b41fa9ff98cc2ebf0c282c8ad096299924d89 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Gilman <davidgilman1@gmail.com>
|
||
|
|
Date: Mon, 23 Oct 2023 19:22:07 +0100
|
||
|
|
Subject: [PATCH] Resolve test_multi_pk.py Flask-SQLAlchemy Model
|
||
|
|
DeprecationWarning
|
||
|
|
|
||
|
|
---
|
||
|
|
flask_admin/tests/sqla/test_multi_pk.py | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/flask_admin/tests/sqla/test_multi_pk.py b/flask_admin/tests/sqla/test_multi_pk.py
|
||
|
|
index dd122baee..d73625cc7 100644
|
||
|
|
--- a/flask_admin/tests/sqla/test_multi_pk.py
|
||
|
|
+++ b/flask_admin/tests/sqla/test_multi_pk.py
|
||
|
|
@@ -1,7 +1,11 @@
|
||
|
|
from . import setup
|
||
|
|
from .test_basic import CustomModelView
|
||
|
|
|
||
|
|
-from flask_sqlalchemy import Model
|
||
|
|
+try:
|
||
|
|
+ # Flask-SQLAlchemy 3
|
||
|
|
+ from flask_sqlalchemy.model import Model
|
||
|
|
+except ImportError:
|
||
|
|
+ from flask_sqlalchemy import Model
|
||
|
|
from sqlalchemy.ext.declarative import declarative_base
|
||
|
|
|
||
|
|
|