From 764dacd6a2e28ab2dfa478d35754f4258fea641e Mon Sep 17 00:00:00 2001 From: Sophist Date: Sun, 30 Apr 2017 12:59:09 +0100 Subject: [PATCH] Simplify copymerge --- picard/script.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/picard/script.py b/picard/script.py index d9c61539d..0c671c728 100644 --- a/picard/script.py +++ b/picard/script.py @@ -28,6 +28,7 @@ from inspect import getargspec from picard.metadata import Metadata from picard.metadata import MULTI_VALUED_JOINER from picard.plugin import ExtensionPoint +from picard.util import uniqify class ScriptError(Exception): @@ -506,14 +507,7 @@ def func_copymerge(parser, new, old): old = "~" + old[1:] newvals = parser.context.getall(new) oldvals = parser.context.getall(old) - result = [] - for x in newvals: - if x not in result: - result.append(x) - for x in oldvals: - if x not in result: - result.append(x) - parser.context[new] = result + parser.context[new] = uniqify(newvals + oldvals) return ""