← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python3.3/trusty

« back to all changes in this revision

Viewing changes to Lib/xmlrpc/server.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-11-19 08:46:55 UTC
  • mfrom: (22.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20131119084655-pueqfadzs5v1xf53
Tags: 3.3.3-1
http://bugs.debian.org/725240
* Python 3.3.3 release.
* Update to 20131119 from the 3.3 branch.
* Regenerate the patches.
* Update the symbols files.
* Fix test support when the running kernel doesn't handle port reuse.
* libpython3.3-minimal replaces libpython3.3-stdlib (<< 3.2.3-7).
  Closes: #725240.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/xmlrpc/server.py
756
756
            self.escape(anchor), self.escape(name))
757
757
 
758
758
        if inspect.ismethod(object):
759
 
            args, varargs, varkw, defaults = inspect.getargspec(object)
 
759
            args = inspect.getfullargspec(object)
760
760
            # exclude the argument bound to the instance, it will be
761
761
            # confusing to the non-Python user
762
762
            argspec = inspect.formatargspec (
763
 
                    args[1:],
764
 
                    varargs,
765
 
                    varkw,
766
 
                    defaults,
 
763
                    args.args[1:],
 
764
                    args.varargs,
 
765
                    args.varkw,
 
766
                    args.defaults,
 
767
                    annotations=args.annotations,
767
768
                    formatvalue=self.formatvalue
768
769
                )
769
770
        elif inspect.isfunction(object):
770
 
            args, varargs, varkw, defaults = inspect.getargspec(object)
 
771
            args = inspect.getfullargspec(object)
771
772
            argspec = inspect.formatargspec(
772
 
                args, varargs, varkw, defaults, formatvalue=self.formatvalue)
 
773
                args.args, args.varargs, args.varkw, args.defaults,
 
774
                annotations=args.annotations,
 
775
                formatvalue=self.formatvalue)
773
776
        else:
774
777
            argspec = '(...)'
775
778