# HG changeset patch # User Christian Brabandt # Date 1522178107 -7200 # Node ID 54756c29118c8659ee69938cbe4a52906ab5adb6 # Parent 32712864489bfabc24288fa97e468bdb9ec26422 patch 8.0.1648: resource fork tool doesn't work on Python 3 commit https://github.com/vim/vim/commit/1b2f61e732a961c1345bf3bb6826c1caa870c10d Author: Bram Moolenaar Date: Tue Mar 27 21:12:01 2018 +0200 patch 8.0.1648: resource fork tool doesn't work on Python 3 Problem: Resource fork tool doesn't work on Python 3. Solution: Use "print()" instead of "print". (Marius Gedminas) diff --git a/src/dehqx.py b/src/dehqx.py --- a/src/dehqx.py +++ b/src/dehqx.py @@ -1,7 +1,7 @@ # Python script to get both the data and resource fork from a BinHex encoded # file. # Author: MURAOKA Taro -# Last Change: 2012 Jun 29 +# Last Change: 2018 Mar 27 # # Copyright (C) 2003,12 MURAOKA Taro # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. @@ -15,11 +15,13 @@ info = conv.FInfo out = conv.FName out_data = out out_rsrc = out + '.rsrcfork' -#print 'out_rsrc=' + out_rsrc -print 'In file: ' + input + +# This uses the print statement on Python 2, print function on Python 3. +#print('out_rsrc=' + out_rsrc) +print('In file: ' + input) outfile = open(out_data, 'wb') -print ' Out data fork: ' + out_data +print(' Out data fork: ' + out_data) while 1: d = conv.read(128000) if not d: break @@ -29,7 +31,7 @@ conv.close_data() d = conv.read_rsrc(128000) if d: - print ' Out rsrc fork: ' + out_rsrc + print(' Out rsrc fork: ' + out_rsrc) outfile = open(out_rsrc, 'wb') outfile.write(d) while 1: diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1648, +/**/ 1647, /**/ 1646,