Karsten Hopp 5fda7d
To: vim_dev@googlegroups.com
Karsten Hopp 5fda7d
Subject: Patch 7.3.716
Karsten Hopp 5fda7d
Fcc: outbox
Karsten Hopp 5fda7d
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5fda7d
Mime-Version: 1.0
Karsten Hopp 5fda7d
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5fda7d
Content-Transfer-Encoding: 8bit
Karsten Hopp 5fda7d
------------
Karsten Hopp 5fda7d
Karsten Hopp 5fda7d
Patch 7.3.716
Karsten Hopp 5fda7d
Problem:    Error on exit when using Python 3.
Karsten Hopp 5fda7d
Solution:   Remove PythonIO_Fini(). (Roland Puntaier)
Karsten Hopp 5fda7d
Files:	    src/if_python3.c
Karsten Hopp 5fda7d
Karsten Hopp 5fda7d
Karsten Hopp 5fda7d
*** ../vim-7.3.715/src/if_python3.c	2012-10-23 05:17:33.000000000 +0200
Karsten Hopp 5fda7d
--- src/if_python3.c	2012-11-20 10:59:54.000000000 +0100
Karsten Hopp 5fda7d
***************
Karsten Hopp 5fda7d
*** 657,663 ****
Karsten Hopp 5fda7d
  static PyObject *globals;
Karsten Hopp 5fda7d
  
Karsten Hopp 5fda7d
  static int PythonIO_Init(void);
Karsten Hopp 5fda7d
- static void PythonIO_Fini(void);
Karsten Hopp 5fda7d
  PyMODINIT_FUNC Py3Init_vim(void);
Karsten Hopp 5fda7d
  
Karsten Hopp 5fda7d
  /******************************************************
Karsten Hopp 5fda7d
--- 657,662 ----
Karsten Hopp 5fda7d
***************
Karsten Hopp 5fda7d
*** 685,691 ****
Karsten Hopp 5fda7d
  	// acquire lock before finalizing
Karsten Hopp 5fda7d
  	pygilstate = PyGILState_Ensure();
Karsten Hopp 5fda7d
  
Karsten Hopp 5fda7d
- 	PythonIO_Fini();
Karsten Hopp 5fda7d
  	Py_Finalize();
Karsten Hopp 5fda7d
      }
Karsten Hopp 5fda7d
  
Karsten Hopp 5fda7d
--- 684,689 ----
Karsten Hopp 5fda7d
***************
Karsten Hopp 5fda7d
*** 989,1001 ****
Karsten Hopp 5fda7d
      return PythonIO_Init_io();
Karsten Hopp 5fda7d
  }
Karsten Hopp 5fda7d
  
Karsten Hopp 5fda7d
-     static void
Karsten Hopp 5fda7d
- PythonIO_Fini(void)
Karsten Hopp 5fda7d
- {
Karsten Hopp 5fda7d
-     PySys_SetObject("stdout", NULL);
Karsten Hopp 5fda7d
-     PySys_SetObject("stderr", NULL);
Karsten Hopp 5fda7d
- }
Karsten Hopp 5fda7d
- 
Karsten Hopp 5fda7d
  /******************************************************
Karsten Hopp 5fda7d
   * 3. Implementation of the Vim module for Python
Karsten Hopp 5fda7d
   */
Karsten Hopp 5fda7d
--- 987,992 ----
Karsten Hopp 5fda7d
*** ../vim-7.3.715/src/version.c	2012-11-14 22:38:04.000000000 +0100
Karsten Hopp 5fda7d
--- src/version.c	2012-11-15 21:40:47.000000000 +0100
Karsten Hopp 5fda7d
***************
Karsten Hopp 5fda7d
*** 727,728 ****
Karsten Hopp 5fda7d
--- 727,730 ----
Karsten Hopp 5fda7d
  {   /* Add new patch number below this line */
Karsten Hopp 5fda7d
+ /**/
Karsten Hopp 5fda7d
+     716,
Karsten Hopp 5fda7d
  /**/
Karsten Hopp 5fda7d
Karsten Hopp 5fda7d
-- 
Karsten Hopp 5fda7d
Nothing is fool-proof to a sufficiently talented fool.
Karsten Hopp 5fda7d
Karsten Hopp 5fda7d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5fda7d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5fda7d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 5fda7d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///