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

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index f32dab19afe21b1ffd7423bf1a0b18eb1572eb66..e331116c89dceaa4f2978eb8c780cbe13f6fd9cd 100644 (file)
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -410,7 +410,7 @@ class Server(object):
             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()
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 3326bd94b0746440da2e50a45cba02495e970f9d..c3c105b3175fada35cad3eaa2689425960d0da98 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -82,6 +82,9 @@ Core and Builtins
 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