Date: Saturday, January 7, 2017 @ 17:37:39 Author: anatolik Revision: 285539
FS#52401: python3.6 rebuild bump vim version to 8.0.0149 Added: vim/trunk/fix-tests-python36.patch Modified: vim/trunk/PKGBUILD --------------------------+ PKGBUILD | 9 +++++++-- fix-tests-python36.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-07 16:04:10 UTC (rev 285538) +++ PKGBUILD 2017-01-07 17:37:39 UTC (rev 285539) @@ -9,7 +9,7 @@ pkgbase=vim pkgname=(vim gvim vim-runtime) -pkgver=8.0.0086 +pkgver=8.0.0149 _versiondir=80 pkgrel=1 arch=(i686 x86_64) @@ -19,12 +19,14 @@ source=(vim-$pkgver.tar.gz::http://github.com/vim/vim/archive/v$pkgver.tar.gz 0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch 0002-Further-fix-widget-sizing.patch + fix-tests-python36.patch vimrc archlinux.vim vimdoc.hook) -sha1sums=('d4e6cf6223965aedda744c5f97a8d5d55ff77b33' +sha1sums=('70782aa518b5d2803ec4dc65333752f20792c67e' 'ca4a3bdf8b512336bff4af3ae93d95a8580e0eaf' '04b86163bb379a7d42058d932aed3075ed49d2a9' + '6e1f78544449293cd0b19d8265a26a83106994b5' '539bfaa0517dfff6d61c37f9c2d81a0db756a4c9' '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2' 'adc4c82b6c4097944e5a767270a772721455eb8c') @@ -37,6 +39,9 @@ #patch -Np2 -i "$srcdir"/0001-Fix-widget-sizing-on-current-Gtk-3.22-branch.patch #patch -Np2 -i "$srcdir"/0002-Further-fix-widget-sizing.patch + # https://github.com/vim/vim/issues/1359 + patch -p2 < "$srcdir"/fix-tests-python36.patch + # define the place for the global (g)vimrc file (set to /etc/vimrc) sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h Added: fix-tests-python36.patch =================================================================== --- fix-tests-python36.patch (rev 0) +++ fix-tests-python36.patch 2017-01-07 17:37:39 UTC (rev 285539) @@ -0,0 +1,38 @@ +commit 70c8d2d8c412ad5639db8a018c7385fd99d0373f +Author: Anatol Pomozov <[email protected]> +Date: Sat Jan 7 09:26:22 2017 -0800 + + Fix error messages for Python 3.6 + + https://github.com/vim/vim/issues/1359 + https://bugs.archlinux.org/task/52401 + https://bbs.archlinux.org/viewtopic.php?id=221579 + +diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok +index d90ef8625..b51788bde 100644 +--- a/src/testdir/test87.ok ++++ b/src/testdir/test87.ok +@@ -658,10 +658,10 @@ assert sys.stderr.closed()==False:NOT FAILED + assert sys.stdout.errors=="strict":NOT FAILED + assert sys.stderr.errors=="strict":NOT FAILED + assert sys.stdout.encoding==sys.stderr.encoding:NOT FAILED +-sys.stdout.write(None):(<class 'TypeError'>, TypeError("Can't convert 'NoneType' object to str implicitly",)) ++sys.stdout.write(None):(<class 'TypeError'>, TypeError('argument must be str, bytes or bytearray, not None',)) + >> OutputWriteLines + sys.stdout.writelines(None):(<class 'TypeError'>, TypeError("'NoneType' object is not iterable",)) +-sys.stdout.writelines([1]):(<class 'TypeError'>, TypeError("Can't convert 'int' object to str implicitly",)) ++sys.stdout.writelines([1]):(<class 'TypeError'>, TypeError('argument must be str, bytes or bytearray, not int',)) + >>> Testing *Iter* using sys.stdout.writelines(%s) + sys.stdout.writelines(FailingIter()):(<class 'NotImplementedError'>, NotImplementedError('iter',)) + sys.stdout.writelines(FailingIterNext()):(<class 'NotImplementedError'>, NotImplementedError('next',)) +@@ -700,8 +700,8 @@ vim.foreach_rtp(NoArgsCall()):(<class 'TypeError'>, TypeError('__call__() takes + vim.foreach_rtp(FailingCall()):(<class 'NotImplementedError'>, NotImplementedError('call',)) + vim.foreach_rtp(int, 2):(<class 'TypeError'>, TypeError('foreach_rtp() takes exactly one argument (2 given)',)) + > import +-import xxx_no_such_module_xxx:(<class 'ImportError'>, ImportError('No module named xxx_no_such_module_xxx',)) +-import failing_import:(<class 'ImportError'>, ImportError('No module named failing_import',)) ++import xxx_no_such_module_xxx:(<class 'ModuleNotFoundError'>, ModuleNotFoundError("No module named 'xxx_no_such_module_xxx'",)) ++import failing_import:(<class 'ModuleNotFoundError'>, ModuleNotFoundError("No module named 'failing_import'",)) + import failing:(<class 'NotImplementedError'>, NotImplementedError()) + > Options + >> OptionsItem
