diff options
| author | Jesse Noller <jnoller@gmail.com> | 2009-01-21 02:15:48 (GMT) |
|---|---|---|
| committer | Jesse Noller <jnoller@gmail.com> | 2009-01-21 02:15:48 (GMT) |
| commit | 63b3a97a2a7277fb05e2aeaee9890a25fb385702 (patch) | |
| tree | 31da4d3262d20c369d0953761765b22186e4e9fc | |
| parent | 08838b6acf4d0fecefcf4222632719985190dd67 (diff) | |
| download | cpython-63b3a97a2a7277fb05e2aeaee9890a25fb385702.zip cpython-63b3a97a2a7277fb05e2aeaee9890a25fb385702.tar.gz cpython-63b3a97a2a7277fb05e2aeaee9890a25fb385702.tar.bz2 | |
merge r68839 forward to py3k
| -rw-r--r-- | Lib/multiprocessing/managers.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_multiprocessing.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index 78c1fe7..cb102e5 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -139,7 +139,7 @@ class Server(object): self.listener = Listener(address=address, backlog=5) self.address = self.listener.address - self.id_to_obj = {0: (None, ())} + self.id_to_obj = {'0': (None, ())} self.id_to_refcount = {} self.mutex = threading.RLock() self.stop = 0 @@ -301,7 +301,7 @@ class Server(object): keys = list(self.id_to_obj.keys()) keys.sort() for ident in keys: - if ident != 0: + if ident != '0': result.append(' %s: refcount=%s\n %s' % (ident, self.id_to_refcount[ident], str(self.id_to_obj[ident][0])[:75])) @@ -313,7 +313,7 @@ class Server(object): ''' Number of shared objects ''' - return len(self.id_to_obj) - 1 # don't count ident=0 + return len(self.id_to_obj) - 1 # don't count ident='0' def shutdown(self, c): ''' diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index 9a307de..3681c60d 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1058,8 +1058,10 @@ class _TestZZZNumberOfObjects(BaseTestCase): multiprocessing.active_children() # discard dead process objs gc.collect() # do garbage collection refs = self.manager._number_of_objects() + debug_info = self.manager._debug_info() if refs != EXPECTED_NUMBER: print(self.manager._debug_info()) + print(debug_info) self.assertEqual(refs, EXPECTED_NUMBER) |