Skip to content

returning original object of outputfiles #2411

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

Open
sidharth-sinhasane wants to merge 2 commits into
base: develop
Choose a base branch
from
+1 −28
Open

returning original object of outputfiles #2411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8af69b7
returning original object
sidharth-sinhasane Apr 6, 2025
6c2337b
returning proxy of original object
sidharth-sinhasane Apr 8, 2025
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
29 changes: 1 addition & 28 deletions ganga/GangaCore/GPIDev/Lib/Job/Job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,34 +554,7 @@ def _attribute_filter__get__(self, name):
return object.__getattribute__(self, name)

if name == "outputfiles":
currentOutputFiles = object.__getattribute__(self, name)
currentUnCopyableOutputFiles = object.__getattribute__(
self, "non_copyable_outputfiles"
)

files = []
files2 = []

for f in currentOutputFiles:
if f.containsWildcards() and hasattr(f, "subfiles") and f.subfiles:
files.extend(f.subfiles)
else:
files.append(f)

for f in currentUnCopyableOutputFiles:
if f.containsWildcards() and hasattr(f, "subfiles") and f.subfiles:
files2.extend(f.subfiles)
else:
files2.append(f)

files3 = GangaList()
files3.extend(files)
files3.extend(files2)

# FIXME THIS SHOULD NOT HAVE TO BE HERE! (It does else we end up with really bad errors and this is wrong!)
files3._setParent(self)

return addProxy(files3)
return addProxy(object.__getattribute__(self, name))

# If we ask for 'inputfiles', return the expanded list of subfiles
if name == "inputfiles":
Expand Down