# HG changeset patch # User Martin von Zweigbergk # Date 1562886257 25200 # Node ID 724c67878d98b49c9b7059ad66d6a68d689bf1b8 # Parent 854637e3d2d029720a365468e87f5662c73f1bdd py3: use inspect.signature() instead of inspect.getargspec() on py3 diff -r 854637e3d2d0 -r 724c67878d98 hgext3rd/evolve/compat.py --- a/hgext3rd/evolve/compat.py Tue Jul 09 10:56:42 2019 -0700 +++ b/hgext3rd/evolve/compat.py Thu Jul 11 16:04:17 2019 -0700 @@ -114,9 +114,14 @@ args = [a, '', b, '', fn1, fn2] # hg < 4.6 compat 8b6dd3922f70 - argspec = inspect.getargspec(mdiff.unidiff) + if util.safehasattr(inspect, 'signature'): + signature = inspect.signature(mdiff.unidiff) + needsbinary = 'binary' in signature.parameters + else: + argspec = inspect.getargspec(mdiff.unidiff) + needsbinary = 'binary' in argspec.args - if 'binary' in argspec.args: + if needsbinary: args.append(False) return mdiff.unidiff(*args)