To: vim_dev@googlegroups.com

Subject: Patch 7.3.1233

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.1233

Problem:    Various Python problems.

Solution:   Fix VimTryEnd. Crash with debug build and PYTHONDUMPREFS=1. Memory

	    leaks in StringToLine(), BufferMark() and convert_dl. (ZyX)

Files:	    src/if_py_both.h, src/testdir/test86.in, src/testdir/test86.ok,

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

*** ../vim-7.3.1232/src/if_py_both.h	2013-06-23 14:30:42.000000000 +0200

--- src/if_py_both.h	2013-06-23 14:34:17.000000000 +0200

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

*** 544,563 ****

  VimTryEnd(void)

  {

      --trylevel;

      if (got_int)

      {

  	PyErr_SetNone(PyExc_KeyboardInterrupt);

! 	return 1;

      }

      else if (!did_throw)

! 	return 0;

      else if (PyErr_Occurred())

! 	return 1;

      else

      {

  	PyErr_SetVim((char *) current_exception->value);

  	discard_current_exception();

! 	return 1;

      }

  }

--- 544,573 ----

  VimTryEnd(void)

  {

      --trylevel;

+     /* Without this it stops processing all subsequent VimL commands and 

+      * generates strange error messages if I e.g. try calling Test() in a cycle */

+     did_emsg = FALSE;

+     /* Keyboard interrupt should be preferred over anything else */

      if (got_int)

      {

+ 	did_throw = got_int = FALSE;

  	PyErr_SetNone(PyExc_KeyboardInterrupt);

! 	return -1;

      }

      else if (!did_throw)

! 	return (PyErr_Occurred() ? -1 : 0);

!     /* Python exception is preferred over vim one; unlikely to occur though */

      else if (PyErr_Occurred())

!     {

! 	did_throw = FALSE;

! 	return -1;

!     }

!     /* Finally transform VimL exception to python one */

      else

      {

  	PyErr_SetVim((char *) current_exception->value);

  	discard_current_exception();

! 	return -1;

      }

  }

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

*** 2649,2655 ****

      static PyObject *

  FunctionRepr(FunctionObject *self)

  {

!     return PyString_FromFormat("<vim.Function '%s'>", self->name);

  }

  static struct PyMethodDef FunctionMethods[] = {

--- 2659,2672 ----

      static PyObject *

  FunctionRepr(FunctionObject *self)

  {

! #ifdef Py_TRACE_REFS

!     /* For unknown reason self->name may be NULL after calling 

!      * Finalize */

!     return PyString_FromFormat("<vim.Function '%s'>",

! 	    (self->name == NULL ? "<NULL>" : (char *) self->name));

! #else

!     return PyString_FromFormat("<vim.Function '%s'>", (char *) self->name);

! #endif

  }

  static struct PyMethodDef FunctionMethods[] = {

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

*** 3534,3539 ****

--- 3551,3557 ----

  	else

  	{

  	    PyErr_SET_VIM("string cannot contain newlines");

+ 	    Py_XDECREF(bytes);

  	    return NULL;

  	}

      }

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

*** 3545,3550 ****

--- 3563,3569 ----

      if (save == NULL)

      {

  	PyErr_NoMemory();

+ 	Py_XDECREF(bytes);

  	return NULL;

      }

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

*** 4551,4556 ****

--- 4570,4576 ----

      {

  	PyErr_SET_STRING(PyExc_ValueError,

  		"mark name must be a single character");

+ 	Py_XDECREF(todecref);

  	return NULL;

      }

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

*** 5298,5303 ****

--- 5318,5326 ----

  	    tv->v_type = VAR_UNKNOWN;

  	    return -1;

  	}

+ 

+ 	Py_DECREF(capsule);

+ 

  	if (py_to_tv(obj, tv, lookup_dict) == -1)

  	{

  	    tv->v_type = VAR_UNKNOWN;

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

*** 5378,5390 ****

  	tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);

  	++tv->vval.v_dict->dv_refcount;

      }

!     else if (obj->ob_type == &ListType)

      {

  	tv->v_type = VAR_LIST;

  	tv->vval.v_list = (((ListObject *)(obj))->list);

  	++tv->vval.v_list->lv_refcount;

      }

!     else if (obj->ob_type == &FunctionType)

      {

  	if (set_string_copy(((FunctionObject *) (obj))->name, tv) == -1)

  	    return -1;

--- 5401,5413 ----

  	tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);

  	++tv->vval.v_dict->dv_refcount;

      }

!     else if (PyType_IsSubtype(obj->ob_type, &ListType))

      {

  	tv->v_type = VAR_LIST;

  	tv->vval.v_list = (((ListObject *)(obj))->list);

  	++tv->vval.v_list->lv_refcount;

      }

!     else if (PyType_IsSubtype(obj->ob_type, &FunctionType))

      {

  	if (set_string_copy(((FunctionObject *) (obj))->name, tv) == -1)

  	    return -1;

*** ../vim-7.3.1232/src/testdir/test86.in	2013-06-12 14:26:20.000000000 +0200

--- src/testdir/test86.in	2013-06-23 14:34:17.000000000 +0200

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

*** 11,18 ****

  :set noswapfile

  :if !has('python') | e! test.ok | wq! test.out | endif

  :lang C

- :py import vim

  :fun Test()

  :let l = []

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

  :py f=vim.bindeval('function("strlen")')

--- 11,18 ----

  :set noswapfile

  :if !has('python') | e! test.ok | wq! test.out | endif

  :lang C

  :fun Test()

+ :py import vim

  :let l = []

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

  :py f=vim.bindeval('function("strlen")')

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

*** 58,63 ****

--- 58,66 ----

  :  $put =string(key) . ' : ' . string(Val)

  :  unlet key Val

  :endfor

+ :py del dk

+ :py del di

+ :py del dv

  :"

  :" removing items with del

  :py del l[2]

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

*** 176,187 ****

  :unlockvar! l

  :"

  :" Function calls

! :function New(...)

! :return ['NewStart']+a:000+['NewEnd']

! :endfunction

! :function DictNew(...) dict

! :return ['DictNewStart']+a:000+['DictNewEnd', self]

! :endfunction

  :let l=[function('New'), function('DictNew')]

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

  :py l.extend(list(l[0](1, 2, 3)))

--- 179,190 ----

  :unlockvar! l

  :"

  :" Function calls

! :fun New(...)

! :   return ['NewStart']+a:000+['NewEnd']

! :endfun

! :fun DictNew(...) dict

! :   return ['DictNewStart']+a:000+['DictNewEnd', self]

! :endfun

  :let l=[function('New'), function('DictNew')]

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

  :py l.extend(list(l[0](1, 2, 3)))

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

*** 211,216 ****

--- 214,220 ----

  :   $put ='[0.0, 0.0]'

  :endif

  :let messages=[]

+ :delfunction DictNew

  py <

  d=vim.bindeval('{}')

  m=vim.bindeval('messages')

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

*** 220,234 ****

      except:

          m.extend([sys.exc_type.__name__])

! em('d["abc"]')

! em('d["abc"]="\\0"')

! em('d["abc"]=vim')

  em('d[""]=1')

  em('d["a\\0b"]=1')

  em('d[u"a\\0b"]=1')

! em('d.pop("abc")')

  em('d.popitem()')

  EOF

  :$put =messages

  :unlet messages

--- 224,240 ----

      except:

          m.extend([sys.exc_type.__name__])

! em('d["abc1"]')

! em('d["abc1"]="\\0"')

! em('d["abc1"]=vim')

  em('d[""]=1')

  em('d["a\\0b"]=1')

  em('d[u"a\\0b"]=1')

! em('d.pop("abc1")')

  em('d.popitem()')

+ del em

+ del m

  EOF

  :$put =messages

  :unlet messages

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

*** 240,247 ****

  :    let toput=s.' : '.join(map(['locked', 'scope'], 'v:val.":".pyeval(name.".".v:val)'), ';')

  :    $put =toput

  :endfor

! :silent! let d.abc=1

! :silent! let dl.abc=1

  :py d.locked=True

  :py dl.locked=False

  :silent! let d.def=1

--- 246,253 ----

  :    let toput=s.' : '.join(map(['locked', 'scope'], 'v:val.":".pyeval(name.".".v:val)'), ';')

  :    $put =toput

  :endfor

! :silent! let d.abc2=1

! :silent! let dl.abc3=1

  :py d.locked=True

  :py dl.locked=False

  :silent! let d.def=1

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

*** 307,318 ****

--- 313,327 ----

              time.sleep(0.1)

  t = T()

+ del T

  t.start()

  EOF

  :sleep 1

  :py t.running = False

  :py t.join()

  :py l[0] = t.t > 8  # check if the background thread is working

+ :py del time

+ :py del threading

  :$put =string(l)

  :"

  :" settrace

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

*** 333,338 ****

--- 342,349 ----

  EOF

  :py sys.settrace(traceit)

  :py trace_main()

+ :py del traceit

+ :py del trace_main

  :py sys.settrace(None)

  :$put =string(l)

  :"

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

*** 363,369 ****

  :"

  :" Vars

  :let g:foo = 'bac'

! :let w:abc = 'def'

  :let b:baz = 'bar'

  :let t:bar = 'jkl'

  :try

--- 374,380 ----

  :"

  :" Vars

  :let g:foo = 'bac'

! :let w:abc3 = 'def'

  :let b:baz = 'bar'

  :let t:bar = 'jkl'

  :try

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

*** 372,378 ****

  :  put =pyeval('vim.vvars[''exception'']')

  :endtry

  :put =pyeval('vim.vars[''foo'']')

! :put =pyeval('vim.current.window.vars[''abc'']')

  :put =pyeval('vim.current.buffer.vars[''baz'']')

  :put =pyeval('vim.current.tabpage.vars[''bar'']')

  :"

--- 383,389 ----

  :  put =pyeval('vim.vvars[''exception'']')

  :endtry

  :put =pyeval('vim.vars[''foo'']')

! :put =pyeval('vim.current.window.vars[''abc3'']')

  :put =pyeval('vim.current.buffer.vars[''baz'']')

  :put =pyeval('vim.current.tabpage.vars[''bar'']')

  :"

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

*** 420,435 ****

          vim.command('let exc=' + repr(sys.exc_type.__name__))

          return 0

  EOF

! :function E(s)

  :   python e(vim.eval('a:s'))

! :endfunction

! :function Ev(s)

  :   let r=pyeval('ev(vim.eval("a:s"))')

  :   if exists('exc')

  :       throw exc

  :   endif

  :   return r

! :endfunction

  :py gopts1=vim.options

  :py wopts1=vim.windows[2].options

  :py wopts2=vim.windows[0].options

--- 431,446 ----

          vim.command('let exc=' + repr(sys.exc_type.__name__))

          return 0

  EOF

! :fun E(s)

  :   python e(vim.eval('a:s'))

! :endfun

! :fun Ev(s)

  :   let r=pyeval('ev(vim.eval("a:s"))')

  :   if exists('exc')

  :       throw exc

  :   endif

  :   return r

! :endfun

  :py gopts1=vim.options

  :py wopts1=vim.windows[2].options

  :py wopts2=vim.windows[0].options

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

*** 444,450 ****

  :let lst+=[['operatorfunc',   'A',   'B',   'C',   2,      0,    1,      0    ]]

  :let lst+=[['number',         0,     1,     1,     0,      1,    0,      1    ]]

  :let lst+=[['numberwidth',    2,     3,     5,     -100,   0,    0,      1    ]]

! :let lst+=[['colorcolumn',    '+1',  '+2',  '+3',  'abc',  0,    0,      1    ]]

  :let lst+=[['statusline',     '1',   '2',   '4',   0,      0,    1,      1    ]]

  :let lst+=[['autoindent',     0,     1,     1,     2,      1,    0,      2    ]]

  :let lst+=[['shiftwidth',     0,     2,     1,     3,      0,    0,      2    ]]

--- 455,461 ----

  :let lst+=[['operatorfunc',   'A',   'B',   'C',   2,      0,    1,      0    ]]

  :let lst+=[['number',         0,     1,     1,     0,      1,    0,      1    ]]

  :let lst+=[['numberwidth',    2,     3,     5,     -100,   0,    0,      1    ]]

! :let lst+=[['colorcolumn',    '+1',  '+2',  '+3',  'abc4',  0,    0,      1    ]]

  :let lst+=[['statusline',     '1',   '2',   '4',   0,      0,    1,      1    ]]

  :let lst+=[['autoindent',     0,     1,     1,     2,      1,    0,      2    ]]

  :let lst+=[['shiftwidth',     0,     2,     1,     3,      0,    0,      2    ]]

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

*** 494,503 ****

--- 505,531 ----

  :   endfor

  :   call RecVars(oname)

  :endfor

+ :delfunction RecVars

+ :delfunction E

+ :delfunction Ev

+ :py del ev

+ :py del e

  :only

  :for buf in g:bufs[1:]

  :   execute 'bwipeout!' buf

  :endfor

+ :py del gopts1

+ :py del wopts1

+ :py del wopts2

+ :py del wopts3

+ :py del bopts1

+ :py del bopts2

+ :py del bopts3

+ :py del oval1

+ :py del oval2

+ :py del oval3

+ :py del oname

+ :py del invval

  :"

  :" Test buffer object

  :vnew

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

*** 517,523 ****

  # Tests BufferAppend and BufferItem

  cb.append(b[0])

  # Tests BufferSlice and BufferAssSlice

! cb.append('abc') # Will be overwritten

  cb[-1:] = b[:-2]

  # Test BufferLength and BufferAssSlice

  cb.append('def') # Will not be overwritten

--- 545,551 ----

  # Tests BufferAppend and BufferItem

  cb.append(b[0])

  # Tests BufferSlice and BufferAssSlice

! cb.append('abc5') # Will be overwritten

  cb[-1:] = b[:-2]

  # Test BufferLength and BufferAssSlice

  cb.append('def') # Will not be overwritten

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

*** 541,553 ****

  cb.append(b.name[-11:].replace(os.path.sep, '/'))

  cb.name = old_name

  cb.append(cb.name[-17:].replace(os.path.sep, '/'))

  # Test CheckBuffer

  for _b in vim.buffers:

      if _b is not cb:

          vim.command('bwipeout! ' + str(_b.number))

  del _b

  cb.append('valid: b:%s, cb:%s' % (repr(b.valid), repr(cb.valid)))

! for expr in ('b[1]','b[:] = ["A", "B"]','b[:]','b.append("abc")', 'b.name = "!"'):

      try:

          exec(expr)

      except vim.error:

--- 569,582 ----

  cb.append(b.name[-11:].replace(os.path.sep, '/'))

  cb.name = old_name

  cb.append(cb.name[-17:].replace(os.path.sep, '/'))

+ del old_name

  # Test CheckBuffer

  for _b in vim.buffers:

      if _b is not cb:

          vim.command('bwipeout! ' + str(_b.number))

  del _b

  cb.append('valid: b:%s, cb:%s' % (repr(b.valid), repr(cb.valid)))

! for expr in ('b[1]','b[:] = ["A", "B"]','b[:]','b.append("abc6")', 'b.name = "!"'):

      try:

          exec(expr)

      except vim.error:

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

*** 557,562 ****

--- 586,592 ----

          # Should not happen in any case

          cb.append('No exception for ' + expr)

  vim.command('cd .')

+ del b

  EOF

  :augroup BUFS

  :   autocmd!

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

*** 598,603 ****

--- 628,634 ----

      # Check indexing: vim.buffers[number].number == number

      cb.append(str(b.number) + ':' + repr(vim.buffers[b.number]) + '=' + repr(b))

      prevnum = b.number

+ del prevnum

  cb.append(str(len(vim.buffers)))

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

*** 621,626 ****

--- 652,659 ----

      next(i4)

  except StopIteration:

      cb.append('StopIteration')

+ del i4

+ del bnums

  EOF

  :"

  :" Test vim.{tabpage,window}list and vim.{tabpage,window} objects

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

*** 663,669 ****

--- 696,706 ----

                      raise ValueError

              except Exception:

                  cb.append('!!!!!! Error while getting attribute ' + attr + ': ' + sys.exc_type.__name__)

+         del aval

+         del attr

          w.cursor = (len(w.buffer), 0)

+ del W

+ del Cursor

  cb.append('Number of windows in current tab page: ' + str(len(vim.windows)))

  if list(vim.windows) != list(vim.current.tabpage.windows):

      cb.append('!!!!!! Windows differ')

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

*** 676,681 ****

--- 713,719 ----

  cb.append('Current tab page: ' + repr(vim.current.tabpage))

  cb.append('Current window: ' + repr(vim.current.window) + ': ' + H(vim.current.window) + ' is ' + H(vim.current.tabpage.window))

  cb.append('Current buffer: ' + repr(vim.current.buffer) + ': ' + H(vim.current.buffer) + ' is ' + H(vim.current.window.buffer)+ ' is ' + H(vim.current.tabpage.window.buffer))

+ del H

  # Assigning: fails

  try:

      vim.current.window = vim.tabpages[0].window

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

*** 687,692 ****

--- 725,731 ----

          setattr(vim.current, attr, None)

      except TypeError:

          cb.append('Type error at assigning None to vim.current.' + attr)

+ del attr

  # Assigning: success

  vim.current.tabpage = vim.tabpages[-2]

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

*** 702,709 ****

--- 741,753 ----

  for b in vim.buffers:

      if b is not cb:

          vim.command('bwipeout! ' + str(b.number))

+ del b

  cb.append('w.valid: ' + repr([w.valid for w in ws]))

  cb.append('t.valid: ' + repr([t.valid for t in ts]))

+ del w

+ del t

+ del ts

+ del ws

  EOF

  :tabonly!

  :only!

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

*** 722,727 ****

--- 766,773 ----

      ('vim.current.tabpage',              'TabPage'),

  ):

      cb.append(expr + ':' + attr + ':' + repr(type(eval(expr)) is getattr(vim, attr)))

+ del expr

+ del attr

  EOF

  :"

  :" Test __dir__() method

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

*** 747,761 ****

  :$put =string(pyeval('vim.Dictionary(a=1)'))

  :$put =string(pyeval('vim.Dictionary(((''a'', 1),))'))

  :$put =string(pyeval('vim.List()'))

! :$put =string(pyeval('vim.List(iter(''abc''))'))

  :$put =string(pyeval('vim.Function(''tr'')'))

  :"

  :" Test stdout/stderr

  :redir => messages

! :py sys.stdout.write('abc') ; sys.stdout.write('def')

! :py sys.stderr.write('abc') ; sys.stderr.write('def')

! :py sys.stdout.writelines(iter('abc'))

! :py sys.stderr.writelines(iter('abc'))

  :redir END

  :$put =string(substitute(messages, '\d\+', '', 'g'))

  :" Test subclassing

--- 793,807 ----

  :$put =string(pyeval('vim.Dictionary(a=1)'))

  :$put =string(pyeval('vim.Dictionary(((''a'', 1),))'))

  :$put =string(pyeval('vim.List()'))

! :$put =string(pyeval('vim.List(iter(''abc7''))'))

  :$put =string(pyeval('vim.Function(''tr'')'))

  :"

  :" Test stdout/stderr

  :redir => messages

! :py sys.stdout.write('abc8') ; sys.stdout.write('def')

! :py sys.stderr.write('abc9') ; sys.stderr.write('def')

! :py sys.stdout.writelines(iter('abcA'))

! :py sys.stderr.writelines(iter('abcB'))

  :redir END

  :$put =string(substitute(messages, '\d\+', '', 'g'))

  :" Test subclassing

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

*** 776,782 ****

          return [super(DupList, self).__getitem__(idx)] * 2

  dl = DupList()

! dl2 = DupList(iter('abc'))

  dl.extend(dl2[0])

  class DupFun(vim.Function):

--- 822,828 ----

          return [super(DupList, self).__getitem__(idx)] * 2

  dl = DupList()

! dl2 = DupList(iter('abcC'))

  dl.extend(dl2[0])

  class DupFun(vim.Function):

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

*** 789,794 ****

--- 835,853 ----

  :$put =string(pyeval('dl'))

  :$put =string(pyeval('dl2'))

  :$put =string(pyeval('df(2)'))

+ :$put =string(pyeval('dl') is# pyeval('dl'))

+ :$put =string(pyeval('dd') is# pyeval('dd'))

+ :$put =string(pyeval('df'))

+ :delfunction Put

+ py << EOF

+ del DupDict

+ del DupList

+ del DupFun

+ del dd

+ del dl

+ del dl2

+ del df

+ EOF

  :"

  :" Test chdir

  py << EOF

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

*** 802,807 ****

--- 861,867 ----

  os.chdir('testdir')

  cb.append(fnamemodify('.', ':p:h:t'))

  cb.append(vim.eval('@%'))

+ del fnamemodify

  EOF

  :"

  :" Test errors

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

*** 828,838 ****

      else:

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

  d = vim.Dictionary()

! ned = vim.Dictionary(foo='bar', baz='abc')

  dl = vim.Dictionary(a=1)

  dl.locked = True

  l = vim.List()

! ll = vim.List('abc')

  ll.locked = True

  f = vim.Function('string')

  fd = vim.Function('F')

--- 888,898 ----

      else:

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

  d = vim.Dictionary()

! ned = vim.Dictionary(foo='bar', baz='abcD')

  dl = vim.Dictionary(a=1)

  dl.locked = True

  l = vim.List()

! ll = vim.List('abcE')

  ll.locked = True

  f = vim.Function('string')

  fd = vim.Function('F')

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

*** 869,879 ****

      # pydict_to_tv

      stringtochars_test(expr % '{%s : 1}')

      if recurse:

!         convertfrompyobject_test(expr % '{"abc" : %s}', False)

      # pymap_to_tv

      stringtochars_test(expr % 'Mapping({%s : 1})')

      if recurse:

!         convertfrompyobject_test(expr % 'Mapping({"abc" : %s})', False)

      # pyseq_to_tv

      iter_test(expr)

      return subexpr_test(expr, 'ConvertFromPyObject', (

--- 929,939 ----

      # pydict_to_tv

      stringtochars_test(expr % '{%s : 1}')

      if recurse:

!         convertfrompyobject_test(expr % '{"abcF" : %s}', False)

      # pymap_to_tv

      stringtochars_test(expr % 'Mapping({%s : 1})')

      if recurse:

!         convertfrompyobject_test(expr % 'Mapping({"abcG" : %s})', False)

      # pyseq_to_tv

      iter_test(expr)

      return subexpr_test(expr, 'ConvertFromPyObject', (

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

*** 916,922 ****

          raise NotImplementedError

      def keys(self):

!         return list("abc")

  class FailingMapping(object):

      def __getitem__(self):

--- 976,982 ----

          raise NotImplementedError

      def keys(self):

!         return list("abcH")

  class FailingMapping(object):

      def __getitem__(self):

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

*** 958,964 ****

  ee('vim.strwidth(1)')

  cb.append("> Dictionary")

  cb.append(">> DictionaryConstructor")

! ee('vim.Dictionary("abc")')

  ##! Not checked: py_dict_alloc failure

  cb.append(">> DictionarySetattr")

  ee('del d.locked')

--- 1018,1024 ----

  ee('vim.strwidth(1)')

  cb.append("> Dictionary")

  cb.append(">> DictionaryConstructor")

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

  ##! Not checked: py_dict_alloc failure

  cb.append(">> DictionarySetattr")

  ee('del d.locked')

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

*** 973,978 ****

--- 1033,1039 ----

  ee('dl.pop("a")')

  cb.append(">> DictionaryIterNext")

  ee('for i in ned: ned["a"] = 1')

+ del i

  cb.append(">> DictionaryAssItem")

  ee('dl["b"] = 1')

  stringtochars_test('d[%s] = 1')

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

*** 1002,1008 ****

  ee('ll[1] = 2')

  ee('l[1000] = 3')

  cb.append(">> ListAssSlice")

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

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

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

  cb.append(">> ListConcatInPlace")

--- 1063,1069 ----

  ee('ll[1] = 2')

  ee('l[1000] = 3')

  cb.append(">> ListAssSlice")

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

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

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

  cb.append(">> ListConcatInPlace")

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

*** 1033,1040 ****

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

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

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

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

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

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

  cb.append("> WinList")

  cb.append(">> WinListItem")

--- 1094,1101 ----

  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")

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

*** 1044,1050 ****

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

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

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

! cb.append(">> SetBufferLines (indirect)")

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

  ee('vim.current.buffer[:] = ["\\na", "bc"]')

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

--- 1105,1111 ----

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

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

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

! cb.append(">> SetBufferLineList (indirect)")

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

  ee('vim.current.buffer[:] = ["\\na", "bc"]')

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

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

*** 1062,1068 ****

  ee('vim.current.buffer.xxx = True')

  cb.append(">> BufferMark")

  ee('vim.current.buffer.mark(0)')

! ee('vim.current.buffer.mark("abc")')

  ee('vim.current.buffer.mark("!")')

  cb.append(">> BufferRange")

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

--- 1123,1129 ----

  ee('vim.current.buffer.xxx = True')

  cb.append(">> BufferMark")

  ee('vim.current.buffer.mark(0)')

! ee('vim.current.buffer.mark("abcM")')

  ee('vim.current.buffer.mark("!")')

  cb.append(">> BufferRange")

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

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

*** 1079,1085 ****

--- 1140,1167 ----

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

  ee('vim.current.tabpage = True')

  ee('vim.current.xxx = True')

+ del d

+ del ned

+ del dl

+ del l

+ del ll

+ del f

+ del fd

+ del fdel

+ del subexpr_test

+ del stringtochars_test

+ del Mapping

+ del convertfrompyobject_test

+ del convertfrompymapping_test

+ del iter_test

+ del FailingTrue

+ del FailingIter

+ del FailingIterNext

+ del FailingMapping

+ del FailingMappingKey

+ del FailingList

  EOF

+ :delfunction F

  :"

  :" Test import

  py << EOF

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

*** 1093,1098 ****

--- 1175,1184 ----

  cb.append(before.dir)

  import after

  cb.append(after.dir)

+ del before

+ del after

+ del d

+ del ddir

  EOF

  :"

  :" Test exceptions

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

*** 1101,1118 ****

  :endfun

  py << EOF

  Exe = vim.bindeval('function("Exe")')

! ee('vim.command("throw \'abc\'")')

  ee('Exe("throw \'def\'")')

  ee('vim.eval("Exe(\'throw \'\'ghi\'\'\')")')

  ee('vim.eval("Exe(\'echoerr \'\'jkl\'\'\')")')

  ee('vim.eval("Exe(\'xxx_non_existent_command_xxx\')")')

  ee('vim.bindeval("Exe(\'xxx_non_existent_command_xxx\')")')

  EOF

  :endfun

  :"