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
index 34d9ae4b0be90bc2912d0a16b16eaff2764b299c..00e8f9f34032dc884e675e1f21e3f3ec62827733 100644 (file)
--- 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 <koron.kaoriya@gmail.com>
-# Last Change: 2012 Jun 29
+# Last Change: 2018 Mar 27
 #
 # Copyright (C) 2003,12 MURAOKA Taro <koron.kaoriya@gmail.com>
 # 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
index df56277e7e1e09d967a70d8e09e6d141e542db51..00a07bc1068063911ac4aad9c2405e6e89a34fe3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1648,
 /**/
     1647,
 /**/