[Python-checkins] r74735 - in python/branches/release26-maint: Misc/NEWS Modules/pwdmodule.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Sep  9 13:46:13 2009
New Revision: 74735

Log:
Merged revisions 74727 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74727 | benjamin.peterson | 2009-09-08 18:04:22 -0500 (Tue, 08 Sep 2009) | 1 line
  
  #6865 fix ref counting in initialization of pwd module
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/pwdmodule.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Wed Sep  9 13:46:13 2009
@@ -778,6 +778,9 @@
 Library
 -------
 
+- Issue #6865: Fix reference counting issue in the initialization of the pwd
+  module.
+
 - Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an
   exception.
 

Modified: python/branches/release26-maint/Modules/pwdmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/pwdmodule.c	(original)
+++ python/branches/release26-maint/Modules/pwdmodule.c	Wed Sep  9 13:46:13 2009
@@ -194,6 +194,7 @@
 	Py_INCREF((PyObject *) &StructPwdType);
 	PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType);
 	/* And for b/w compatibility (this was defined by mistake): */
+        Py_INCREF((PyObject *) &StructPwdType);
 	PyModule_AddObject(m, "struct_pwent", (PyObject *) &StructPwdType);
 	initialized = 1;
 }