[Python-checkins] r74904 - in python/branches/release26-maint: Lib/multiprocessing/managers.py Misc/NEWS

Fri Sep 18 11:19:53 CEST 2009

Author: georg.brandl
Date: Fri Sep 18 11:19:52 2009
New Revision: 74904
Log:
Merged revisions 74903 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r74903 | georg.brandl | 2009年09月18日 11:18:27 +0200 (Fr, 18 Sep 2009) | 1 line
 
 #6938: "ident" is always a string, so use a format code which works.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/multiprocessing/managers.py
 python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/multiprocessing/managers.py
==============================================================================

--- python/branches/release26-maint/Lib/multiprocessing/managers.py	(original)
+++ python/branches/release26-maint/Lib/multiprocessing/managers.py	Fri Sep 18 11:19:52 2009
@@ -410,7 +410,7 @@
 self.id_to_refcount[ident] -= 1
 if self.id_to_refcount[ident] == 0:
 del self.id_to_obj[ident], self.id_to_refcount[ident]
- util.debug('disposing of obj with id %d', ident)
+ util.debug('disposing of obj with id %r', ident)
 finally:
 self.mutex.release()
 
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri Sep 18 11:19:52 2009
@@ -82,6 +82,9 @@
 Library
 -------
 
+- Issue #6938: Fix a TypeError in string formatting of a multiprocessing
+ debug message.
+
 - Issue #6635: Fix profiler printing usage message.
 
 - Issue #6795: int(Decimal('nan')) now raises ValueError instead of
