From b5ac66999426281f01b5643f9e81479551daf7a0 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Wed, 6 Dec 2017 15:20:24 +0000 Subject: [PATCH] framework/output: Fix checking artifact kind Don't construct an ArtifactType in Output.Add_artifact, the Artifact class does that for us. Next, fix the use of a nonexistent attribute Artifact.valid_kinds --- wa/framework/output.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wa/framework/output.py b/wa/framework/output.py index ac50a4fa..b3d2abe4 100644 --- a/wa/framework/output.py +++ b/wa/framework/output.py @@ -85,9 +85,6 @@ class Output(object): raise HostError(msg.format(path)) path = os.path.relpath(path, self.basepath) - if isinstance(kind, basestring): - kind = ArtifactType(kind) - self.result.add_artifact(name, path, kind, description, classifiers) def add_event(self, message): @@ -276,7 +273,8 @@ class Result(object): ) -ArtifactType = enum(['log', 'meta', 'data', 'export', 'raw']) +ARTIFACT_TYPES = ['log', 'meta', 'data', 'export', 'raw'] +ArtifactType = enum(ARTIFACT_TYPES) class Artifact(object): @@ -356,7 +354,7 @@ class Artifact(object): self.kind = ArtifactType(kind) except ValueError: msg = 'Invalid Artifact kind: {}; must be in {}' - raise ValueError(msg.format(kind, self.valid_kinds)) + raise ValueError(msg.format(kind, ARTIFACT_TYPES)) self.description = description self.classifiers = classifiers or {}