Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ambari-common/src/main/python/ambari_jinja2/docs/jinjaext.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,12 @@ def format_function(name, aliases, func):
signature = match.group(1)
else:
try:
argspec = inspect.getargspec(func)
sig = inspect.signature(func)
params = list(sig.parameters.values())
if getattr(func, 'environmentfilter', False) or \
getattr(func, 'contextfilter', False):
del argspec[0][0]
signature = inspect.formatargspec(*argspec)
params = params[1:]
signature = f"({', '.join(str(param) for param in params)})"
except:
pass
result = [f'.. function:: {name}{signature}', '']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ def restart(self, env):
else:
# To remain backward compatible with older stacks, only pass upgrade_type if available.
# TODO, remove checking the argspec for "upgrade_type" once all of the services support that optional param.
if "upgrade_type" in inspect.getargspec(self.stop).args:
if "upgrade_type" in inspect.signature(self.stop).parameters:
self.stop(env, upgrade_type=upgrade_type)
else:
if is_stack_upgrade:
Expand Down Expand Up @@ -1192,7 +1192,7 @@ def restart(self, env):
# To remain backward compatible with older stacks, only pass upgrade_type if available.
# TODO, remove checking the argspec for "upgrade_type" once all of the services support that optional param.
self.pre_start(env)
if "upgrade_type" in inspect.getargspec(self.start).args:
if "upgrade_type" in inspect.signature(self.start).parameters:
self.start(env, upgrade_type=upgrade_type)
else:
if is_stack_upgrade:
Expand Down
18 changes: 8 additions & 10 deletions ambari-common/src/test/python/mock/mock.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,14 @@ def _getsignature(func, skipfirst, instance=False):
regargs = regargs[1:]

if inPy3k:
signature = inspect.formatargspec(
regargs,
varargs,
varkw,
defaults,
kwonly,
kwonlydef,
ann,
formatvalue=lambda value: "",
)
parts = []
if regargs:
parts.extend(regargs)
if varargs:
parts.append("*" + varargs)
if varkw:
parts.append("**" + varkw)
signature = "(" + ", ".join(parts) + ")"
else:
signature = inspect.formatargspec(
regargs, varargs, varkwargs, defaults, formatvalue=lambda value: ""
Expand Down