github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 08:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

wiki: Fix files undefined in finally case.

Browse Source
This commit is contained in:
Max Goodman
2012-09-12 10:22:05 -07:00
committed by Neil Williams
parent d56f02e8ed
commit a0899409b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/lib/merge.py
View File

@@ -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'))