summaryrefslogtreecommitdiffstats
path: root/Lib/xmlrpc
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:52:29 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:52:29 (GMT)
commitaabbda5354407cfe35097c7f17717a716a3d80c4 (patch)
treee15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/xmlrpc
parentac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff)
parent5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff)
downloadcpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip
cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz
cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2
Merge 3.2
Diffstat (limited to 'Lib/xmlrpc')
-rw-r--r--Lib/xmlrpc/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
index 9477309..ac252f1 100644
--- a/Lib/xmlrpc/server.py
+++ b/Lib/xmlrpc/server.py
@@ -149,7 +149,7 @@ def list_public_methods(obj):
return [member for member in dir(obj)
if not member.startswith('_') and
- hasattr(getattr(obj, member), '__call__')]
+ callable(getattr(obj, member))]
class SimpleXMLRPCDispatcher:
"""Mix-in class that dispatches XML-RPC requests.