To: vim_dev@googlegroups.com Subject: Patch 8.0.1648 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1648 Problem: Resource fork tool doesn't work on Python 3. Solution: Use "print()" instead of "print". (Marius Gedminas) Files: src/dehqx.py *** ../vim-8.0.1647/src/dehqx.py 2012-06-29 11:27:41.000000000 +0200 --- src/dehqx.py 2018-03-27 21:10:21.575109043 +0200 *************** *** 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 # # Copyright (C) 2003,12 MURAOKA Taro # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. --- 1,7 ---- # Python script to get both the data and resource fork from a BinHex encoded # file. # Author: MURAOKA Taro ! # Last Change: 2018 Mar 27 # # Copyright (C) 2003,12 MURAOKA Taro # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. *************** *** 15,25 **** out = conv.FName out_data = out out_rsrc = out + '.rsrcfork' ! #print 'out_rsrc=' + out_rsrc ! print 'In file: ' + input outfile = open(out_data, 'wb') ! print ' Out data fork: ' + out_data while 1: d = conv.read(128000) if not d: break --- 15,27 ---- out = conv.FName out_data = out out_rsrc = out + '.rsrcfork' ! ! # 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) while 1: d = conv.read(128000) if not d: break *************** *** 29,35 **** d = conv.read_rsrc(128000) if d: ! print ' Out rsrc fork: ' + out_rsrc outfile = open(out_rsrc, 'wb') outfile.write(d) while 1: --- 31,37 ---- d = conv.read_rsrc(128000) if d: ! print(' Out rsrc fork: ' + out_rsrc) outfile = open(out_rsrc, 'wb') outfile.write(d) while 1: *** ../vim-8.0.1647/src/version.c 2018-03-26 21:38:45.196332620 +0200 --- src/version.c 2018-03-27 21:04:18.649297573 +0200 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1648, /**/ -- hundred-and-one symptoms of being an internet addict: 76. Your ISP regards you as a business partner rather than as a customer. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///