From aa8796598ab9bcfd31c9ccc21d6dcf6fbf6d2e23 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 29 Oct 2010 11:54:38 +0000 Subject: [PATCH] Actually restore the original asyncore socket map by making a copy of the dict --- Lib/test/regrtest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index db5ccf4d467..958582a5033 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -872,11 +872,12 @@ class saved_test_environment: def get_asyncore_socket_map(self): asyncore = sys.modules.get('asyncore') - return asyncore and asyncore.socket_map or {} + # XXX Making a copy keeps objects alive until __exit__ gets called. + return asyncore and asyncore.socket_map.copy() or {} def restore_asyncore_socket_map(self, saved_map): asyncore = sys.modules.get('asyncore') if asyncore is not None: - asyncore.socket_map.clear() + asyncore.close_all(ignore_all=True) asyncore.socket_map.update(saved_map) def resource_info(self): @@ -892,9 +893,11 @@ class saved_test_environment: return self def __exit__(self, exc_type, exc_val, exc_tb): + saved_values = self.saved_values + del self.saved_values for name, get, restore in self.resource_info(): current = get() - original = self.saved_values[name] + original = saved_values.pop(name) # Check for changes to the resource's value if current != original: self.changed = True