Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sweep:integration] fix(Workflow): prevent circular import in WorkflowReader #7576

Merged
merged 1 commit into from
Apr 18, 2024
+6 −3
Merged

[sweep:integration] fix(Workflow): prevent circular import in WorkflowReader #7576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/DIRAC/Core/Workflow/Workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,20 @@ def execute(self):
return S_OK(step_result)


from DIRAC.Core.Workflow.WorkflowReader import WorkflowXMLHandler


def fromXMLString(xml_string, obj=None):
# prevent circular import in WorkflowReader
from DIRAC.Core.Workflow.WorkflowReader import WorkflowXMLHandler

# KGG !!! We need to reset Workflow if it exists
handler = WorkflowXMLHandler(obj)
xml.sax.parseString(xml_string, handler)
return handler.root


def fromXMLFile(xml_file, obj=None):
# prevent circular import in WorkflowReader
from DIRAC.Core.Workflow.WorkflowReader import WorkflowXMLHandler

# KGG !!! We need to reset Workflow if it exists
handler = WorkflowXMLHandler(obj)
xml.sax.parse(xml_file, handler)
Expand Down
Loading