Skip to content

Commit db33de7

Browse files
committed
Fix loggng for Python 2
1 parent 02664ec commit db33de7

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

formulate/logging.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def get_identifier():
2121
for i in range(5))
2222

2323

24-
def add_logging(func=None, *, ignore_args=None, ignore_kwargs=None):
24+
def add_logging(*args, **kwargs):
2525
"""Decorator to add logging to a method
2626
2727
Parameters
@@ -33,6 +33,12 @@ def add_logging(func=None, *, ignore_args=None, ignore_kwargs=None):
3333
ignore_kwargs : list
3434
Names of the keyword arguments to ignore
3535
"""
36+
# Workaround for Python 2
37+
func = args[0] if args else kwargs.pop('func', None)
38+
ignore_args = kwargs.pop('ignore_args', None)
39+
ignore_kwargs = kwargs.pop('ignore_kwargs', None)
40+
assert len(args) in [0, 1] and not kwargs, (args, kwargs)
41+
3642
def real_decorator(func):
3743
@wraps(func)
3844
def new_func(*args, **kwargs):

0 commit comments

Comments
 (0)