To: vim_dev@googlegroups.com

Subject: Patch 7.3.1236

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.1236

Problem:    Python: WindowSetattr() missing support for NUMBER_UNSIGNED.

Solution:   Add NUMBER_UNSIGNED, add more tests. Various fixes. (ZyX)

Files:	    src/if_py_both.h, src/if_python3.c, src/if_python.c,

	    src/testdir/pythonx/failing.py,

	    src/testdir/pythonx/failing_import.py, src/testdir/test86.in,

	    src/testdir/test86.ok, src/testdir/test87.in,

	    src/testdir/test87.ok, src/testdir/pythonx/topmodule/__init__.py,

	    src/testdir/pythonx/topmodule/submodule/__init__.py,

	    src/testdir/pythonx/topmodule/submodule/subsubmodule/__init__.py,

	    src/testdir/pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py

*** ../vim-7.3.1235/src/if_py_both.h	2013-06-23 16:04:04.000000000 +0200

--- src/if_py_both.h	2013-06-23 16:27:37.000000000 +0200

***************

*** 1611,1617 ****

      ret = (rObj == Py_True);

!     Py_DECREF(Py_True);

      return ret;

  }

--- 1611,1617 ----

      ret = (rObj == Py_True);

!     Py_DECREF(rObj);

      return ret;

  }

***************

*** 1910,1916 ****

  		    PyErr_FORMAT(PyExc_ValueError,

  			    N_("expected sequence element of size 2, "

  			    "but got sequence of size %d"),

! 			    PySequence_Fast_GET_SIZE(fast));

  		    return NULL;

  		}

--- 1910,1916 ----

  		    PyErr_FORMAT(PyExc_ValueError,

  			    N_("expected sequence element of size 2, "

  			    "but got sequence of size %d"),

! 			    (int) PySequence_Fast_GET_SIZE(fast));

  		    return NULL;

  		}

***************

*** 2435,2440 ****

--- 2435,2444 ----

  	clear_tv(&v);

      }

      Py_DECREF(iterator);

+ 

+     if (PyErr_Occurred())

+ 	return -1;

+ 

      return 0;

  }

***************

*** 3361,3367 ****

  	long	height;

  	win_T	*savewin;

! 	if (NumberToLong(valObject, &height, NUMBER_INT))

  	    return -1;

  #ifdef FEAT_GUI

--- 3365,3371 ----

  	long	height;

  	win_T	*savewin;

! 	if (NumberToLong(valObject, &height, NUMBER_INT|NUMBER_UNSIGNED))

  	    return -1;

  #ifdef FEAT_GUI

***************

*** 3384,3390 ****

  	long	width;

  	win_T	*savewin;

! 	if (NumberToLong(valObject, &width, NUMBER_INT))

  	    return -1;

  #ifdef FEAT_GUI

--- 3388,3394 ----

  	long	width;

  	win_T	*savewin;

! 	if (NumberToLong(valObject, &width, NUMBER_INT|NUMBER_UNSIGNED))

  	    return -1;

  #ifdef FEAT_GUI

***************

*** 3518,3524 ****

      char	*str;

      char	*save;

      PyObject	*bytes = NULL;

!     Py_ssize_t	len;

      PyInt	i;

      char	*p;

--- 3522,3528 ----

      char	*str;

      char	*save;

      PyObject	*bytes = NULL;

!     Py_ssize_t	len = 0;

      PyInt	i;

      char	*p;

***************

*** 5483,5488 ****

--- 5487,5493 ----

  #endif

      else if (PyObject_HasAttrString(obj, "keys"))

  	return convert_dl(obj, tv, pymap_to_tv, lookup_dict);

+     /* PyObject_GetIter can create built-in iterator for any sequence object */

      else if (PyIter_Check(obj) || PySequence_Check(obj))

  	return convert_dl(obj, tv, pyseq_to_tv, lookup_dict);

      else if (PyMapping_Check(obj))

***************

*** 5930,5940 ****

      {"_Loader",    (PyObject *)&LoaderType},

  };

- typedef int (*object_adder)(PyObject *, const char *, PyObject *);

- typedef PyObject *(*attr_getter)(PyObject *, const char *);

- 

  #define ADD_OBJECT(m, name, obj) \

!     if (add_object(m, name, obj)) \

  	return -1;

  #define ADD_CHECKED_OBJECT(m, name, obj) \

--- 5935,5942 ----

      {"_Loader",    (PyObject *)&LoaderType},

  };

  #define ADD_OBJECT(m, name, obj) \

!     if (PyModule_AddObject(m, name, obj)) \

  	return -1;

  #define ADD_CHECKED_OBJECT(m, name, obj) \

***************

*** 5946,5952 ****

      }

      static int

! populate_module(PyObject *m, object_adder add_object, attr_getter get_attr)

  {

      int		i;

      PyObject	*other_module;

--- 5948,5954 ----

      }

      static int

! populate_module(PyObject *m)

  {

      int		i;

      PyObject	*other_module;

***************

*** 5990,5996 ****

      if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))

  	return -1;

      ADD_OBJECT(m, "_chdir", py_chdir);

!     if (!(attr = get_attr(m, "chdir")))

  	return -1;

      if (PyObject_SetAttrString(other_module, "chdir", attr))

      {

--- 5992,5998 ----

      if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))

  	return -1;

      ADD_OBJECT(m, "_chdir", py_chdir);

!     if (!(attr = PyObject_GetAttrString(m, "chdir")))

  	return -1;

      if (PyObject_SetAttrString(other_module, "chdir", attr))

      {

***************

*** 6002,6008 ****

      if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir")))

      {

  	ADD_OBJECT(m, "_fchdir", py_fchdir);

! 	if (!(attr = get_attr(m, "fchdir")))

  	    return -1;

  	if (PyObject_SetAttrString(other_module, "fchdir", attr))

  	{

--- 6004,6010 ----

      if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir")))

      {

  	ADD_OBJECT(m, "_fchdir", py_fchdir);

! 	if (!(attr = PyObject_GetAttrString(m, "fchdir")))

  	    return -1;

  	if (PyObject_SetAttrString(other_module, "fchdir", attr))

  	{

*** ../vim-7.3.1235/src/if_python3.c	2013-06-23 14:16:53.000000000 +0200

--- src/if_python3.c	2013-06-23 16:26:40.000000000 +0200

***************

*** 1623,1629 ****

      if ((vim_module = PyModule_Create(&vimmodule)) == NULL)

  	return NULL;

!     if (populate_module(vim_module, PyModule_AddObject, PyObject_GetAttrString))

  	return NULL;

      if (init_sys_path())

--- 1623,1629 ----

      if ((vim_module = PyModule_Create(&vimmodule)) == NULL)

  	return NULL;

!     if (populate_module(vim_module))

  	return NULL;

      if (init_sys_path())

*** ../vim-7.3.1235/src/if_python.c	2013-06-23 14:16:53.000000000 +0200

--- src/if_python.c	2013-06-23 16:26:40.000000000 +0200

***************

*** 1404,1411 ****

      vim_module = Py_InitModule4("vim", VimMethods, (char *)NULL,

  				(PyObject *)NULL, PYTHON_API_VERSION);

!     if (populate_module(vim_module, PyModule_AddObject,

! 			   PyObject_GetAttrString))

  	return -1;

      if (init_sys_path())

--- 1404,1410 ----

      vim_module = Py_InitModule4("vim", VimMethods, (char *)NULL,

  				(PyObject *)NULL, PYTHON_API_VERSION);

!     if (populate_module(vim_module))

  	return -1;

      if (init_sys_path())

*** ../vim-7.3.1235/src/testdir/pythonx/failing.py	2013-06-23 16:35:21.000000000 +0200

--- src/testdir/pythonx/failing.py	2013-06-23 16:22:10.000000000 +0200

***************

*** 0 ****

--- 1 ----

+ raise NotImplementedError

*** ../vim-7.3.1235/src/testdir/pythonx/failing_import.py	2013-06-23 16:35:21.000000000 +0200

--- src/testdir/pythonx/failing_import.py	2013-06-23 16:22:10.000000000 +0200

***************

*** 0 ****

--- 1 ----

+ raise ImportError

*** ../vim-7.3.1235/src/testdir/test86.in	2013-06-23 14:37:00.000000000 +0200

--- src/testdir/test86.in	2013-06-23 16:26:40.000000000 +0200

***************

*** 216,221 ****

--- 216,222 ----

  :let messages=[]

  :delfunction DictNew

  py <

+ import sys

  d=vim.bindeval('{}')

  m=vim.bindeval('messages')

  def em(expr, g=globals(), l=locals()):

***************

*** 297,303 ****

  :" threading

  :let l = [0]

  :py l=vim.bindeval('l')

! :py <

  import threading

  import time

--- 298,304 ----

  :" threading

  :let l = [0]

  :py l=vim.bindeval('l')

! py <

  import threading

  import time

***************

*** 327,333 ****

  :" settrace

  :let l = []

  :py l=vim.bindeval('l')

! :py <

  import sys

  def traceit(frame, event, arg):

--- 328,334 ----

  :" settrace

  :let l = []

  :py l=vim.bindeval('l')

! py <

  import sys

  def traceit(frame, event, arg):

***************

*** 342,350 ****

  EOF

  :py sys.settrace(traceit)

  :py trace_main()

  :py del traceit

  :py del trace_main

- :py sys.settrace(None)

  :$put =string(l)

  :"

  :" Slice

--- 343,351 ----

  EOF

  :py sys.settrace(traceit)

  :py trace_main()

+ :py sys.settrace(None)

  :py del traceit

  :py del trace_main

  :$put =string(l)

  :"

  :" Slice

***************

*** 880,889 ****

          if expr.find('None') > -1:

              msg = msg.replace('TypeError:(\'iteration over non-sequence\',)',

                                'TypeError:("\'NoneType\' object is not iterable",)')

          if expr == 'fd(self=[])':

              # HACK: PyMapping_Check changed meaning

              msg = msg.replace('AttributeError:(\'keys\',)',

!                               'TypeError:(\'unable to convert object to vim dictionary\',)')

          cb.append(expr + ':' + msg)

      else:

          cb.append(expr + ':NOT FAILED')

--- 881,896 ----

          if expr.find('None') > -1:

              msg = msg.replace('TypeError:(\'iteration over non-sequence\',)',

                                'TypeError:("\'NoneType\' object is not iterable",)')

+         if expr.find('FailingNumber') > -1:

+             msg = msg.replace(', not \'FailingNumber\'', '').replace('"', '\'')

+             msg = msg.replace('TypeError:(\'iteration over non-sequence\',)',

+                               'TypeError:("\'FailingNumber\' object is not iterable",)')

+         if msg.find('(\'\'') > -1 or msg.find('(\'can\'t') > -1:

+             msg = msg.replace('(\'', '("').replace('\',)', '",)')

          if expr == 'fd(self=[])':

              # HACK: PyMapping_Check changed meaning

              msg = msg.replace('AttributeError:(\'keys\',)',

!                               'TypeError:(\'unable to convert list to vim dictionary\',)')

          cb.append(expr + ':' + msg)

      else:

          cb.append(expr + ':NOT FAILED')

***************

*** 942,947 ****

--- 949,955 ----

          '{u"": 1}',             # Same, but with unicode object

          'FailingMapping()',     #

          'FailingMappingKey()',  #

+         'FailingNumber()',      #

      ))

  def convertfrompymapping_test(expr):

***************

*** 956,1021 ****

          'FailingIterNext()',

      ))

  class FailingTrue(object):

      def __nonzero__(self):

!         raise NotImplementedError

  class FailingIter(object):

      def __iter__(self):

!         raise NotImplementedError

  class FailingIterNext(object):

      def __iter__(self):

          return self

      def next(self):

!         raise NotImplementedError

  class FailingMappingKey(object):

      def __getitem__(self, item):

!         raise NotImplementedError

      def keys(self):

          return list("abcH")

  class FailingMapping(object):

      def __getitem__(self):

!         raise NotImplementedError

      def keys(self):

!         raise NotImplementedError

  class FailingList(list):

      def __getitem__(self, idx):

          if i == 2:

!             raise NotImplementedError

          else:

              return super(FailingList, self).__getitem__(idx)

  cb.append("> Output")

  cb.append(">> OutputSetattr")

  ee('del sys.stdout.softspace')

! ee('sys.stdout.softspace = []')

  ee('sys.stdout.attr = None')

  cb.append(">> OutputWrite")

  ee('sys.stdout.write(None)')

  cb.append(">> OutputWriteLines")

  ee('sys.stdout.writelines(None)')

  ee('sys.stdout.writelines([1])')

! #iter_test('sys.stdout.writelines(%s)')

  cb.append("> VimCommand")

! ee('vim.command(1)')

  #! Not checked: vim->python exceptions translating: checked later

  cb.append("> VimToPython")

  #! Not checked: everything: needs errors in internal python functions

  cb.append("> VimEval")

! ee('vim.eval(1)')

  #! Not checked: everything: needs errors in internal python functions

  cb.append("> VimEvalPy")

! ee('vim.bindeval(1)')

  #! Not checked: vim->python exceptions translating: checked later

  cb.append("> VimStrwidth")

! ee('vim.strwidth(1)')

  cb.append("> Dictionary")

  cb.append(">> DictionaryConstructor")

  ee('vim.Dictionary("abcI")')

--- 964,1067 ----

          'FailingIterNext()',

      ))

+ def number_test(expr, natural=False, unsigned=False):

+     if natural:

+         unsigned = True

+     return subexpr_test(expr, 'NumberToLong', (

+         '[]',

+         'None',

+     ) + (unsigned and ('-1',) or ())

+     + (natural and ('0',) or ()))

+ 

  class FailingTrue(object):

      def __nonzero__(self):

!         raise NotImplementedError('bool')

  class FailingIter(object):

      def __iter__(self):

!         raise NotImplementedError('iter')

  class FailingIterNext(object):

      def __iter__(self):

          return self

      def next(self):

!         raise NotImplementedError('next')

  class FailingMappingKey(object):

      def __getitem__(self, item):

!         raise NotImplementedError('getitem:mappingkey')

      def keys(self):

          return list("abcH")

  class FailingMapping(object):

      def __getitem__(self):

!         raise NotImplementedError('getitem:mapping')

      def keys(self):

!         raise NotImplementedError('keys')

  class FailingList(list):

      def __getitem__(self, idx):

          if i == 2:

!             raise NotImplementedError('getitem:list')

          else:

              return super(FailingList, self).__getitem__(idx)

+ class NoArgsCall(object):

+     def __call__(self):

+         pass

+ 

+ class FailingCall(object):

+     def __call__(self, path):

+         raise NotImplementedError('call')

+ 

+ class FailingNumber(object):

+     def __int__(self):

+         raise NotImplementedError('int')

+ 

  cb.append("> Output")

  cb.append(">> OutputSetattr")

  ee('del sys.stdout.softspace')

! number_test('sys.stdout.softspace = %s', unsigned=True)

! number_test('sys.stderr.softspace = %s', unsigned=True)

  ee('sys.stdout.attr = None')

  cb.append(">> OutputWrite")

  ee('sys.stdout.write(None)')

  cb.append(">> OutputWriteLines")

  ee('sys.stdout.writelines(None)')

  ee('sys.stdout.writelines([1])')

! iter_test('sys.stdout.writelines(%s)')

  cb.append("> VimCommand")

! stringtochars_test('vim.command(%s)')

! ee('vim.command("", 2)')

  #! Not checked: vim->python exceptions translating: checked later

  cb.append("> VimToPython")

  #! Not checked: everything: needs errors in internal python functions

  cb.append("> VimEval")

! stringtochars_test('vim.eval(%s)')

! ee('vim.eval("", FailingTrue())')

  #! Not checked: everything: needs errors in internal python functions

  cb.append("> VimEvalPy")

! stringtochars_test('vim.bindeval(%s)')

! ee('vim.eval("", 2)')

  #! Not checked: vim->python exceptions translating: checked later

  cb.append("> VimStrwidth")

! stringtochars_test('vim.strwidth(%s)')

! cb.append("> VimForeachRTP")

! ee('vim.foreach_rtp(None)')

! ee('vim.foreach_rtp(NoArgsCall())')

! ee('vim.foreach_rtp(FailingCall())')

! ee('vim.foreach_rtp(int, 2)')

! cb.append('> import')

! old_rtp = vim.options['rtp']

! vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')

! ee('import xxx_no_such_module_xxx')

! ee('import failing_import')

! ee('import failing')

! vim.options['rtp'] = old_rtp

! del old_rtp

  cb.append("> Dictionary")

  cb.append(">> DictionaryConstructor")

  ee('vim.Dictionary("abcI")')

***************

*** 1043,1049 ****

  cb.append(">>> iter")

  ee('d.update(FailingMapping())')

  ee('d.update([FailingIterNext()])')

! #iter_test('d.update(%s)')

  convertfrompyobject_test('d.update(%s)')

  stringtochars_test('d.update(((%s, 0),))')

  convertfrompyobject_test('d.update((("a", %s),))')

--- 1089,1095 ----

  cb.append(">>> iter")

  ee('d.update(FailingMapping())')

  ee('d.update([FailingIterNext()])')

! iter_test('d.update(%s)')

  convertfrompyobject_test('d.update(%s)')

  stringtochars_test('d.update(((%s, 0),))')

  convertfrompyobject_test('d.update((("a", %s),))')

***************

*** 1055,1061 ****

  cb.append(">> ListConstructor")

  ee('vim.List(1, 2)')

  ee('vim.List(a=1)')

! #iter_test('vim.List(%s)')

  convertfrompyobject_test('vim.List([%s])')

  cb.append(">> ListItem")

  ee('l[1000]')

--- 1101,1107 ----

  cb.append(">> ListConstructor")

  ee('vim.List(1, 2)')

  ee('vim.List(a=1)')

! iter_test('vim.List(%s)')

  convertfrompyobject_test('vim.List([%s])')

  cb.append(">> ListItem")

  ee('l[1000]')

***************

*** 1064,1073 ****

  ee('l[1000] = 3')

  cb.append(">> ListAssSlice")

  ee('ll[1:100] = "abcJ"')

! #iter_test('l[:] = %s')

  convertfrompyobject_test('l[:] = [%s]')

  cb.append(">> ListConcatInPlace")

! #iter_test('l.extend(%s)')

  convertfrompyobject_test('l.extend([%s])')

  cb.append(">> ListSetattr")

  ee('del l.locked')

--- 1110,1119 ----

  ee('l[1000] = 3')

  cb.append(">> ListAssSlice")

  ee('ll[1:100] = "abcJ"')

! iter_test('l[:] = %s')

  convertfrompyobject_test('l[:] = [%s]')

  cb.append(">> ListConcatInPlace")

! iter_test('l.extend(%s)')

  convertfrompyobject_test('l.extend([%s])')

  cb.append(">> ListSetattr")

  ee('del l.locked')

***************

*** 1094,1107 ****

  ee('vim.current.window.buffer = 0')

  ee('vim.current.window.cursor = (100000000, 100000000)')

  ee('vim.current.window.cursor = True')

! ee('vim.current.window.height = "abcK"')

! ee('vim.current.window.width  = "abcL"')

  ee('vim.current.window.xxxxxx = True')

  cb.append("> WinList")

  cb.append(">> WinListItem")

  ee('vim.windows[1000]')

  cb.append("> Buffer")

  cb.append(">> StringToLine (indirect)")

  ee('vim.current.buffer[0] = "\\na"')

  cb.append(">> SetBufferLine (indirect)")

  ee('vim.current.buffer[0] = True')

--- 1140,1154 ----

  ee('vim.current.window.buffer = 0')

  ee('vim.current.window.cursor = (100000000, 100000000)')

  ee('vim.current.window.cursor = True')

! number_test('vim.current.window.height = %s', unsigned=True)

! number_test('vim.current.window.width = %s', unsigned=True)

  ee('vim.current.window.xxxxxx = True')

  cb.append("> WinList")

  cb.append(">> WinListItem")

  ee('vim.windows[1000]')

  cb.append("> Buffer")

  cb.append(">> StringToLine (indirect)")

+ ee('vim.current.buffer[0] = u"\\na"')

  ee('vim.current.buffer[0] = "\\na"')

  cb.append(">> SetBufferLine (indirect)")

  ee('vim.current.buffer[0] = True')

***************

*** 1129,1136 ****

  ee('vim.current.buffer.range(1, 2, 3)')

  cb.append("> BufMap")

  cb.append(">> BufMapItem")

- ee('vim.buffers[None]')

  ee('vim.buffers[100000000]')

  cb.append("> Current")

  cb.append(">> CurrentGetattr")

  ee('vim.current.xxx')

--- 1176,1183 ----

  ee('vim.current.buffer.range(1, 2, 3)')

  cb.append("> BufMap")

  cb.append(">> BufMapItem")

  ee('vim.buffers[100000000]')

+ number_test('vim.buffers[%s]', natural=True)

  cb.append("> Current")

  cb.append(">> CurrentGetattr")

  ee('vim.current.xxx')

***************

*** 1154,1165 ****

--- 1201,1216 ----

  del convertfrompyobject_test

  del convertfrompymapping_test

  del iter_test

+ del number_test

  del FailingTrue

  del FailingIter

  del FailingIterNext

  del FailingMapping

  del FailingMappingKey

  del FailingList

+ del NoArgsCall

+ del FailingCall

+ del FailingNumber

  EOF

  :delfunction F

  :"

***************

*** 1168,1173 ****

--- 1219,1234 ----

  sys.path.insert(0, os.path.join(os.getcwd(), 'python_before'))

  sys.path.append(os.path.join(os.getcwd(), 'python_after'))

  vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')

+ l = []

+ def callback(path):

+     l.append(path[-len('/testdir'):])

+ vim.foreach_rtp(callback)

+ cb.append(repr(l))

+ del l

+ def callback(path):

+     return path[-len('/testdir'):]

+ cb.append(repr(vim.foreach_rtp(callback)))

+ del callback

  from module import dir as d

  from modulex import ddir

  cb.append(d + ',' + ddir)

***************

*** 1175,1184 ****

--- 1236,1254 ----

  cb.append(before.dir)

  import after

  cb.append(after.dir)

+ import topmodule as tm

+ import topmodule.submodule as tms

+ import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss

+ cb.append(tm.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/__init__.py'):])

+ cb.append(tms.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/__init__.py'):])

+ cb.append(tmsss.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])

  del before

  del after

  del d

  del ddir

+ del tm

+ del tms

+ del tmsss

  EOF

  :"

  :" Test exceptions

***************

*** 1232,1237 ****

--- 1302,1308 ----

  :call garbagecollect(1)

  :"

  :/^start:/,$wq! test.out

+ :" vim: et ts=4 isk-=\:

  :call getchar()

  ENDTEST

*** ../vim-7.3.1235/src/testdir/test86.ok	2013-06-23 14:37:00.000000000 +0200

--- src/testdir/test86.ok	2013-06-23 16:29:45.000000000 +0200

***************

*** 441,468 ****

  > Output

  >> OutputSetattr

  del sys.stdout.softspace:AttributeError:("can't delete OutputObject attributes",)

  sys.stdout.softspace = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)

  sys.stdout.attr = None:AttributeError:('invalid attribute: attr',)

  >> OutputWrite

  sys.stdout.write(None):TypeError:('coercing to Unicode: need string or buffer, NoneType found',)

  >> OutputWriteLines

  sys.stdout.writelines(None):TypeError:("'NoneType' object is not iterable",)

  sys.stdout.writelines([1]):TypeError:('coercing to Unicode: need string or buffer, int found',)

  > VimCommand

  vim.command(1):TypeError:('expected str() or unicode() instance, but got int',)

  > VimToPython

  > VimEval

  vim.eval(1):TypeError:('expected str() or unicode() instance, but got int',)

  > VimEvalPy

  vim.bindeval(1):TypeError:('expected str() or unicode() instance, but got int',)

  > VimStrwidth

  vim.strwidth(1):TypeError:('expected str() or unicode() instance, but got int',)

  > Dictionary

  >> DictionaryConstructor

  vim.Dictionary("abcI"):ValueError:('expected sequence element of size 2, but got sequence of size 1',)

  >> DictionarySetattr

  del d.locked:AttributeError:('cannot delete vim.Dictionary attributes',)

! d.locked = FailingTrue():NotImplementedError:()

  vim.vvars.locked = False:TypeError:('cannot modify fixed dictionary',)

  d.scope = True:AttributeError:('cannot set attribute scope',)

  d.xxx = True:AttributeError:('cannot set attribute xxx',)

--- 441,509 ----

  > Output

  >> OutputSetattr

  del sys.stdout.softspace:AttributeError:("can't delete OutputObject attributes",)

+ >>> Testing NumberToLong using sys.stdout.softspace = %s

  sys.stdout.softspace = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)

+ sys.stdout.softspace = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)

+ sys.stdout.softspace = -1:ValueError:('number must be greater or equal to zero',)

+ <<< Finished

+ >>> Testing NumberToLong using sys.stderr.softspace = %s

+ sys.stderr.softspace = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)

+ sys.stderr.softspace = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)

+ sys.stderr.softspace = -1:ValueError:('number must be greater or equal to zero',)

+ <<< Finished

  sys.stdout.attr = None:AttributeError:('invalid attribute: attr',)

  >> OutputWrite

  sys.stdout.write(None):TypeError:('coercing to Unicode: need string or buffer, NoneType found',)

  >> OutputWriteLines

  sys.stdout.writelines(None):TypeError:("'NoneType' object is not iterable",)

  sys.stdout.writelines([1]):TypeError:('coercing to Unicode: need string or buffer, int found',)

+ >>> Testing *Iter* using sys.stdout.writelines(%s)

+ sys.stdout.writelines(FailingIter()):NotImplementedError:('iter',)

+ sys.stdout.writelines(FailingIterNext()):NotImplementedError:('next',)

+ <<< Finished

  > VimCommand

+ >>> Testing StringToChars using vim.command(%s)

  vim.command(1):TypeError:('expected str() or unicode() instance, but got int',)

+ vim.command(u"\0"):TypeError:('expected string without null bytes',)

+ vim.command("\0"):TypeError:('expected string without null bytes',)

+ <<< Finished

+ vim.command("", 2):TypeError:('command() takes exactly one argument (2 given)',)

  > VimToPython

  > VimEval

+ >>> Testing StringToChars using vim.eval(%s)

  vim.eval(1):TypeError:('expected str() or unicode() instance, but got int',)

+ vim.eval(u"\0"):TypeError:('expected string without null bytes',)

+ vim.eval("\0"):TypeError:('expected string without null bytes',)

+ <<< Finished

+ vim.eval("", FailingTrue()):TypeError:('function takes exactly 1 argument (2 given)',)

  > VimEvalPy

+ >>> Testing StringToChars using vim.bindeval(%s)

  vim.bindeval(1):TypeError:('expected str() or unicode() instance, but got int',)

+ vim.bindeval(u"\0"):TypeError:('expected string without null bytes',)

+ vim.bindeval("\0"):TypeError:('expected string without null bytes',)

+ <<< Finished

+ vim.eval("", 2):TypeError:('function takes exactly 1 argument (2 given)',)

  > VimStrwidth

+ >>> Testing StringToChars using vim.strwidth(%s)

  vim.strwidth(1):TypeError:('expected str() or unicode() instance, but got int',)

+ vim.strwidth(u"\0"):TypeError:('expected string without null bytes',)

+ vim.strwidth("\0"):TypeError:('expected string without null bytes',)

+ <<< Finished

+ > VimForeachRTP

+ vim.foreach_rtp(None):TypeError:("'NoneType' object is not callable",)

+ vim.foreach_rtp(NoArgsCall()):TypeError:('__call__() takes exactly 1 argument (2 given)',)

+ vim.foreach_rtp(FailingCall()):NotImplementedError:('call',)

+ vim.foreach_rtp(int, 2):TypeError:('foreach_rtp() takes exactly one argument (2 given)',)

+ > import

+ import xxx_no_such_module_xxx:ImportError:('No module named xxx_no_such_module_xxx',)

+ import failing_import:ImportError:('No module named failing_import',)

+ import failing:ImportError:('No module named failing',)

  > Dictionary

  >> DictionaryConstructor

  vim.Dictionary("abcI"):ValueError:('expected sequence element of size 2, but got sequence of size 1',)

  >> DictionarySetattr

  del d.locked:AttributeError:('cannot delete vim.Dictionary attributes',)

! d.locked = FailingTrue():NotImplementedError:('bool',)

  vim.vvars.locked = False:TypeError:('cannot modify fixed dictionary',)

  d.scope = True:AttributeError:('cannot set attribute scope',)

  d.xxx = True:AttributeError:('cannot set attribute xxx',)

***************

*** 501,514 ****

  <<< Finished

  >>> Testing *Iter* using d["a"] = {"abcF" : %s}

  d["a"] = {"abcF" : FailingIter()}:TypeError:('unable to convert FailingIter to vim structure',)

! d["a"] = {"abcF" : FailingIterNext()}:NotImplementedError:()

  <<< Finished

  >>> Testing ConvertFromPyObject using d["a"] = {"abcF" : %s}

  d["a"] = {"abcF" : None}:TypeError:('unable to convert NoneType to vim structure',)

  d["a"] = {"abcF" : {"": 1}}:ValueError:('empty keys are not allowed',)

  d["a"] = {"abcF" : {u"": 1}}:ValueError:('empty keys are not allowed',)

! d["a"] = {"abcF" : FailingMapping()}:NotImplementedError:()

! d["a"] = {"abcF" : FailingMappingKey()}:NotImplementedError:()

  <<< Finished

  >>> Testing StringToChars using d["a"] = Mapping({%s : 1})

  d["a"] = Mapping({1 : 1}):TypeError:('expected str() or unicode() instance, but got int',)

--- 542,556 ----

  <<< Finished

  >>> Testing *Iter* using d["a"] = {"abcF" : %s}

  d["a"] = {"abcF" : FailingIter()}:TypeError:('unable to convert FailingIter to vim structure',)

! d["a"] = {"abcF" : FailingIterNext()}:NotImplementedError:('next',)

  <<< Finished

  >>> Testing ConvertFromPyObject using d["a"] = {"abcF" : %s}

  d["a"] = {"abcF" : None}:TypeError:('unable to convert NoneType to vim structure',)

  d["a"] = {"abcF" : {"": 1}}:ValueError:('empty keys are not allowed',)

  d["a"] = {"abcF" : {u"": 1}}:ValueError:('empty keys are not allowed',)

! d["a"] = {"abcF" : FailingMapping()}:NotImplementedError:('keys',)

! d["a"] = {"abcF" : FailingMappingKey()}:NotImplementedError:('getitem:mappingkey',)

! d["a"] = {"abcF" : FailingNumber()}:TypeError:('long() argument must be a string or a number',)

  <<< Finished

  >>> Testing StringToChars using d["a"] = Mapping({%s : 1})

  d["a"] = Mapping({1 : 1}):TypeError:('expected str() or unicode() instance, but got int',)

***************

*** 527,557 ****

  <<< Finished

  >>> Testing *Iter* using d["a"] = Mapping({"abcG" : %s})

  d["a"] = Mapping({"abcG" : FailingIter()}):TypeError:('unable to convert FailingIter to vim structure',)

! d["a"] = Mapping({"abcG" : FailingIterNext()}):NotImplementedError:()

  <<< Finished

  >>> Testing ConvertFromPyObject using d["a"] = Mapping({"abcG" : %s})

  d["a"] = Mapping({"abcG" : None}):TypeError:('unable to convert NoneType to vim structure',)

  d["a"] = Mapping({"abcG" : {"": 1}}):ValueError:('empty keys are not allowed',)

  d["a"] = Mapping({"abcG" : {u"": 1}}):ValueError:('empty keys are not allowed',)

! d["a"] = Mapping({"abcG" : FailingMapping()}):NotImplementedError:()

! d["a"] = Mapping({"abcG" : FailingMappingKey()}):NotImplementedError:()

  <<< Finished

  >>> Testing *Iter* using d["a"] = %s

  d["a"] = FailingIter():TypeError:('unable to convert FailingIter to vim structure',)

! d["a"] = FailingIterNext():NotImplementedError:()

  <<< Finished

  >>> Testing ConvertFromPyObject using d["a"] = %s

  d["a"] = None:TypeError:('unable to convert NoneType to vim structure',)

  d["a"] = {"": 1}:ValueError:('empty keys are not allowed',)

  d["a"] = {u"": 1}:ValueError:('empty keys are not allowed',)

! d["a"] = FailingMapping():NotImplementedError:()

! d["a"] = FailingMappingKey():NotImplementedError:()

  <<< Finished

  >> DictionaryUpdate

  >>> kwargs

  >>> iter

! d.update(FailingMapping()):NotImplementedError:()

! d.update([FailingIterNext()]):NotImplementedError:()

  >>> Testing StringToChars using d.update({%s : 1})

  d.update({1 : 1}):TypeError:('expected str() or unicode() instance, but got int',)