Add more tests for will; pass raise_exc down to _get_node.

Author: pwwang

tests/test_varname.py

@@ -386,6 +386,7 @@ def i_will():
 
     func = i_will().abc
     assert func.will == 'abc'
+    assert getattr(func, 'will') == 'abc'
 
 def test_will_deep():
 
@@ -427,21 +428,31 @@ def do(self):
     assert c.will == 'do'
     assert result == 'I will do something'
 
-# issue #18
+
 def test_will_method():
     class AwesomeClass:
         def __init__(self):
-            self.will = None
+            self.wills = [None]
+
+        def __call__(self, *_):
+            return self
+
+        myself = __call__
+        __getattr__ = __call__
 
         def permit(self, *_):
-            self.will = will(raise_exc=False)
-            if self.will == 'do':
-                # let self handle do
-                return self
-            raise AttributeError('Should do something with AwesomeClass object')
+            self.wills.append(will(raise_exc=False))
+
+            if self.wills[-1] is None:
+                raise AttributeError(
+                    'Should do something with AwesomeClass object'
+                )
+
+            # let self handle do
+            return self
 
         def do(self):
-            if self.will != 'do':
+            if self.wills[-1] != 'do':
                 raise AttributeError("You don't have permission to do")
             return 'I am doing!'
 
@@ -456,8 +467,31 @@ def do(self):
         awesome.permit()
     assert str(exc.value) == 'Should do something with AwesomeClass object'
 
+    # clear wills
+    awesome = AwesomeClass()
     ret = awesome.permit().do()
     assert ret == 'I am doing!'
+    assert awesome.wills == [None, 'do']
+
+    awesome = AwesomeClass()
+    ret = awesome.myself().permit().do()
+    assert ret == 'I am doing!'
+    assert awesome.wills == [None, 'do']
+
+    awesome = AwesomeClass()
+    ret = awesome().permit().do()
+    assert ret == 'I am doing!'
+    assert awesome.wills == [None, 'do']
+
+    awesome = AwesomeClass()
+    ret = awesome.attr.permit().do()
+    assert ret == 'I am doing!'
+    assert awesome.wills == [None, 'do']
+
+    awesome = AwesomeClass()
+    ret = awesome.permit().permit().do()
+    assert ret == 'I am doing!'
+    assert awesome.wills == [None, 'permit', 'do']
 
     with pytest.raises(AttributeError) as exc:
         print(awesome[2])
@@ -466,6 +500,37 @@ def do(self):
     ret = awesome[2].do()
     assert ret == 'I am doing!'
 
+def test_will_decorated():
+
+    def return_self(func):
+        def wrapper(self, *args, **kwargs):
+            func(self, *args, **kwargs)
+            return self
+
+        return wrapper
+
+    class Foo:
+
+        def __init__(self):
+            self.will = None
+
+        def get_will(self):
+            self.will = will(raise_exc=False)
+            return self
+
+        @return_self
+        def get_will_decor(self):
+            self.will = will(2, raise_exc=False)
+
+        def __getattr__(self, name):
+            return self.will
+
+    x = Foo().get_will().x
+    assert x == 'x'
+
+    x = Foo().get_will_decor().x
+    assert x == 'x'
+
 
 def test_will_fail():
 

varname.py

@@ -38,7 +38,7 @@ def varname(caller: int = 1, raise_exc: bool = True) -> str:
             in the assign node. (e.g: `a = b = func()`, in such a case,
             `b == 'a'`, may not be the case you want)
     """
-    node = _get_node(caller)
+    node = _get_node(caller, raise_exc=raise_exc)
     if not node:
         if raise_exc:
             raise VarnameRetrievingError("Unable to retrieve the ast node.")
@@ -102,7 +102,7 @@ def will(caller: int = 1, raise_exc: bool = True) -> str:
         VarnameRetrievingError: When `raise_exc` is `True` and we failed to
             detect the attribute name (including not having one)
     """
-    node = _get_node(caller)
+    node = _get_node(caller, raise_exc=raise_exc)
     if not node:
         if raise_exc:
             raise VarnameRetrievingError("Unable to retrieve the frame.")
@@ -180,7 +180,7 @@ def nameof(*args, caller: int = 1) -> Union[str, Tuple[str]]:
     Returns:
         tuple|str: The names of variables passed in
     """
-    node = _get_node(caller - 1)
+    node = _get_node(caller - 1, raise_exc=True)
     if not node:
         if len(args) == 1:
             return _bytecode_nameof(caller + 1)
@@ -257,7 +257,7 @@ def _get_frame(caller):
     except Exception as exc:
         raise VarnameRetrievingError from exc
 
-def _get_node(caller):
+def _get_node(caller: int, raise_exc: bool = True):
     """Try to get node from the executing object.
 
     This can fail when a frame is failed to retrieve.
@@ -276,7 +276,7 @@ def _get_node(caller):
     if exet.node:
         return exet.node
 
-    if exet.source.text and exet.source.tree:
+    if exet.source.text and exet.source.tree and raise_exc:
         raise VarnameRetrievingError(
             "Couldn't retrieve the call node. "
             "This may happen if you're using some other AST magic at the "