diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-08-03 22:57:23 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-08-03 22:57:23 (GMT) |
| commit | 0a0f6082442a21058ef1c79463e05bb0d78d2ef7 (patch) | |
| tree | ba21c00fc79e2b4809196eb2961b5b3953596c17 /Lib/SimpleXMLRPCServer.py | |
| parent | c3ce0e53ad81263b20ef660722a4e65c40353654 (diff) | |
| download | cpython-0a0f6082442a21058ef1c79463e05bb0d78d2ef7.zip cpython-0a0f6082442a21058ef1c79463e05bb0d78d2ef7.tar.gz cpython-0a0f6082442a21058ef1c79463e05bb0d78d2ef7.tar.bz2 | |
Remove a dict.has_key() and callable() usage in SimpleXMLRPCServer as triggered
under -3 through test_xmlrpc.
Diffstat (limited to 'Lib/SimpleXMLRPCServer.py')
| -rw-r--r-- | Lib/SimpleXMLRPCServer.py | 4 |
1 files 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 |