From a0899409b11b7025bbb79f8eaffdebe56277f79a Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Wed, 12 Sep 2012 10:22:05 -0700 Subject: [PATCH] wiki: Fix files undefined in finally case. --- r2/r2/lib/merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/r2/r2/lib/merge.py b/r2/r2/lib/merge.py index dcf354613..2db111e58 100644 --- a/r2/r2/lib/merge.py +++ b/r2/r2/lib/merge.py @@ -43,10 +43,10 @@ def make_htmldiff(a, b, adesc, bdesc): todesc=bdesc) def threewaymerge(original, a, b): + temp_dir = g.diff3_temp_location if g.diff3_temp_location else None + data = [a, original, b] + files = [] try: - temp_dir = g.diff3_temp_location if g.diff3_temp_location else None - data = [a, original, b] - files = [] for d in data: f = tempfile.NamedTemporaryFile(dir=temp_dir) f.write(d.encode('utf-8'))