Mercurial > cpython-lru_cache-weakref

diff Lib/xmlrpc/server.py @ 85096:bc49e82ee013 3.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#8112: Update the documenting xmlrpc server to use getfullargspec. Before this patch it would raise an error when trying to display documentation for a method that used annotations. Patch by Claudiu Popa.
author R David Murray <rdmurray@bitdance.com>
date Sat, 10 Aug 2013 12:01:47 -0400
parents 561532103d74
children 69e515209fa9
line wrap: on
line diff
--- a/Lib/xmlrpc/server.py	Sat Aug 10 18:37:05 2013 +0300
+++ b/Lib/xmlrpc/server.py	Sat Aug 10 12:01:47 2013 -0400
@@ -756,20 +756,23 @@
             self.escape(anchor), self.escape(name))
 
         if inspect.ismethod(object):
-            args, varargs, varkw, defaults = inspect.getargspec(object)
+            args = inspect.getfullargspec(object)
             # exclude the argument bound to the instance, it will be
             # confusing to the non-Python user
             argspec = inspect.formatargspec (
-                    args[1:],
-                    varargs,
-                    varkw,
-                    defaults,
+                    args.args[1:],
+                    args.varargs,
+                    args.varkw,
+                    args.defaults,
+                    annotations=args.annotations,
                     formatvalue=self.formatvalue
                 )
         elif inspect.isfunction(object):
-            args, varargs, varkw, defaults = inspect.getargspec(object)
+            args = inspect.getfullargspec(object)
             argspec = inspect.formatargspec(
-                args, varargs, varkw, defaults, formatvalue=self.formatvalue)
+                args.args, args.varargs, args.varkw, args.defaults,
+                annotations=args.annotations,
+                formatvalue=self.formatvalue)
         else:
             argspec = '(...)'