From 191de09fab5c5a63da2643b10df1829dd0b5fe4f Mon Sep 17 00:00:00 2001
From: Daniel Williams <daniel.williams@ligo.org>
Date: Fri, 27 Sep 2019 10:43:23 +0100
Subject: [PATCH] Implements differentiation of methods and tests during
argument inference>
---
bilby/core/utils.py | 39 +++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/bilby/core/utils.py b/bilby/core/utils.py
index 762940b00..3b49351b9 100644
--- a/bilby/core/utils.py
+++ b/bilby/core/utils.py
@@ -30,18 +30,37 @@ _TOL = 14
def infer_parameters_from_function(func):
""" Infers the arguments of a function
- (except the first arg which is assumed to be the dep. variable).
+ (except the first arg which is assumed to be the dep. variable).
- Throws out *args and **kwargs type arguments
+ Throws out *args and **kwargs type arguments
- Can deal with type hinting!
+ Can deal with type hinting!
- Returns
- ---------
- list: A list of strings with the parameters
- """
- return _infer_args_from_function_except_for_first_arg(func=func)
+ Parameters
+ ----------
+ func: function or method
+ The function or method for which the parameters should be inferred.
+ Returns
+ ---------
+ list: A list of strings with the parameters
+
+ Notes
+ -----
+ In order to handle methods the ``type`` of the function is checked, and
+ if a method has been passed the first *two* arguments are removed rather than just the first one.
+ This allows the reference to the instance (conventionally named ``self``)
+ to be removed.
+ """
+ if isinstance(func, types.MethodType):
+ # This is a method, remove the first two arguments
+ return _infer_args_from_function_except_n_args(func, n=2)
+ elif isinstance(func, types.FunctionType):
+ # It's a function, remove just the first argument
+ return _infer_args_from_function_except_for_first_arg(func=func)
+ else:
+ # Panic, I don't understand what I'm looking at
+ raise ValueError("This doesn't look like a function.")
def infer_args_from_method(method):
""" Infers all arguments of a method except for 'self'
@@ -59,8 +78,8 @@ def infer_args_from_method(method):
def _infer_args_from_function_except_n_args(func, n=1):
""" Inspects a function to find its arguments, and ignoring the
- first n of these, returns a list of arguments
- from the function's signature.
+ first n of these, returns a list of arguments from the function's
+ signature.
Parameters
----------
--
GitLab