Fix method resolution order for base model class

galaxyproject · Apr 5, 2024 · eea15e5 · eea15e5
1 parent 8a8a422
commit eea15e5
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
@@ -230,13 +230,6 @@
     from galaxy.tools import DefaultToolState
     from galaxy.workflow.modules import WorkflowModule
 
-    class _HasTable:
-        table: FromClause
-        __table__: FromClause
-
-else:
-    _HasTable = object
-
 
 def get_uuid(uuid: Optional[Union[UUID, str]] = None) -> UUID:
     if isinstance(uuid, UUID):
@@ -246,6 +239,11 @@ def get_uuid(uuid: Optional[Union[UUID, str]] = None) -> UUID:
     return UUID(str(uuid))
 
 
+class _HasTable:
+    table: FromClause
+    __table__: FromClause
+
+
 class Base(_HasTable, DeclarativeBase):
     __abstract__ = True
     metadata = MetaData(naming_convention=NAMING_CONVENTION)