From 0a0f6082442a21058ef1c79463e05bb0d78d2ef7 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sun, 3 Aug 2008 22:57:23 +0000 Subject: Remove a dict.has_key() and callable() usage in SimpleXMLRPCServer as triggered under -3 through test_xmlrpc. --- Lib/SimpleXMLRPCServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py index 5fad0af..43757a0 100644 --- a/Lib/SimpleXMLRPCServer.py +++ b/Lib/SimpleXMLRPCServer.py @@ -141,7 +141,7 @@ def list_public_methods(obj): return [member for member in dir(obj) if not member.startswith('_') and - callable(getattr(obj, member))] + hasattr(getattr(obj, member), '__call__')] def remove_duplicates(lst): """remove_duplicates([2,2,2,1,3,3]) => [3,1,2] @@ -315,7 +315,7 @@ class SimpleXMLRPCDispatcher: Returns a string containing documentation for the specified method.""" method = None - if self.funcs.has_key(method_name): + if method_name in self.funcs: method = self.funcs[method_name] elif self.instance is not None: # Instance can implement _methodHelp to return help for a method -- cgit v0.12