Add latch to _trim_arity so that once the correct arg count has been found, future TypeErrors get correctly raised and don't continue to try updating the argcount

1 files changed, 6 insertions, 3 deletions

diff --git a/src/pyparsing.py b/src/pyparsing.py
index 4534ae2..e6d4c38 100644
--- a/src/pyparsing.py
+++ b/src/pyparsing.py
@@ -624,13 +624,16 @@ def _trim_arity(func, maxargs=3):
     if func in singleArgBuiltins:

         return lambda s,l,t: func(t)

     limit = 0

+    foundArity = False

     def wrapper(*args):

-        nonlocal limit

+        nonlocal limit,foundArity

         while 1:

             try:

-                return func(*args[limit:])

+                ret = func(*args[limit:])

+                foundArity = True

+                return ret

             except TypeError:

-                if limit == maxargs:

+                if limit == maxargs or foundArity:

                     raise

                 limit += 1

                 continue