rename "typing" to avoid conflicts

This commit is contained in:
Fabien Castan 2025-03-26 11:32:35 +00:00
parent 4c7ff6eb1a
commit b3c4f675a8
4 changed files with 4 additions and 4 deletions

View file

@ -20,7 +20,7 @@ from meshroom.core.exception import GraphCompatibilityError, StopGraphVisit, Sto
from meshroom.core.graphIO import GraphIO, GraphSerializer, TemplateGraphSerializer, PartialGraphSerializer from meshroom.core.graphIO import GraphIO, GraphSerializer, TemplateGraphSerializer, PartialGraphSerializer
from meshroom.core.node import BaseNode, Status, Node, CompatibilityNode from meshroom.core.node import BaseNode, Status, Node, CompatibilityNode
from meshroom.core.nodeFactory import nodeFactory from meshroom.core.nodeFactory import nodeFactory
from meshroom.core.typing import PathLike from meshroom.core.mtyping import PathLike
# Replace default encoder to support Enums # Replace default encoder to support Enums
@ -1613,7 +1613,7 @@ def executeGraph(graph, toNodes=None, forceCompute=False, forceStatus=False):
chunk.process(forceCompute) chunk.process(forceCompute)
node.postprocess() node.postprocess()
except Exception as e: except Exception as e:
logging.error("Error on node computation: {}".format(e)) logging.error(f"Error on node computation: {e}")
graph.clearSubmittedNodes() graph.clearSubmittedNodes()
raise raise

View file

@ -70,7 +70,7 @@ class TaskThread(Thread):
stopAndRestart = True stopAndRestart = True
break break
else: else:
logging.error("Error on node computation: {}".format(e)) logging.error(f"Error on node computation: {e}.")
nodesToRemove, _ = self._manager._graph.dfsOnDiscover(startNodes=[node], reverse=True) nodesToRemove, _ = self._manager._graph.dfsOnDiscover(startNodes=[node], reverse=True)
# remove following nodes from the task queue # remove following nodes from the task queue
for n in nodesToRemove[1:]: # exclude current node for n in nodesToRemove[1:]: # exclude current node

View file

@ -9,7 +9,7 @@ from meshroom.core.attribute import ListAttribute, Attribute
from meshroom.core.graph import Graph, GraphModification from meshroom.core.graph import Graph, GraphModification
from meshroom.core.node import Position, CompatibilityIssue from meshroom.core.node import Position, CompatibilityIssue
from meshroom.core.nodeFactory import nodeFactory from meshroom.core.nodeFactory import nodeFactory
from meshroom.core.typing import PathLike from meshroom.core.mtyping import PathLike
class UndoCommand(QUndoCommand): class UndoCommand(QUndoCommand):