Pylint

Author: penguinolog

logwrap/_alogwrap.py

@@ -64,32 +64,29 @@ def wrapper(*args, **kwargs):
 
             try:
                 if asyncio.iscoroutinefunction(func):
-                    self._logger.log(
-                        level=self.log_level,
-                        msg="Awaiting: \n{name!r}({arguments})".format(
-                            name=func.__name__,
-                            arguments=args_repr
-                        )
+                    self._make_calling_record(
+                        name=func.__name__,
+                        arguments=args_repr,
+                        method='Awaiting'
                     )
                     result = yield from func(*args, **kwargs)
                 else:
-                    self._logger.log(
-                        level=self.log_level,
-                        msg="Calling: \n{name!r}({arguments})".format(
-                            name=func.__name__,
-                            arguments=args_repr
-                        )
+
+                    self._make_calling_record(
+                        name=func.__name__,
+                        arguments=args_repr
                     )
                     result = func(*args, **kwargs)
                 self._make_done_record(func.__name__, result)
             except BaseException as e:
                 if isinstance(e, tuple(self.blacklisted_exceptions)):
                     raise
+                arguments = args_repr if self.log_call_args_on_exc else ''
                 self._logger.log(
                     level=self.exc_level,
                     msg="Failed: \n{name!r}({arguments})".format(
                         name=func.__name__,
-                        arguments=args_repr,
+                        arguments=arguments,
                     ),
                     exc_info=True
                 )
@@ -100,6 +97,7 @@ def wrapper(*args, **kwargs):
         return wrapper
 
 
+# pylint: disable=unexpected-keyword-arg
 def async_logwrap(
     log: logging.Logger=_log_wrap_shared.logger,
     log_level: int=logging.DEBUG,
@@ -154,3 +152,4 @@ def async_logwrap(
         log_call_args_on_exc=log_call_args_on_exc,
         log_result_obj=log_result_obj
     )
+# pylint: enable=unexpected-keyword-arg

logwrap/_log_wrap.py

@@ -81,24 +81,19 @@ def wrapper(*args, **kwargs):
                 kwargs=kwargs,
             )
 
-            self._logger.log(
-                level=self.log_level,
-                msg="Calling: \n{name!r}({arguments})".format(
-                    name=func.__name__,
-                    arguments=args_repr
-                )
-            )
+            self._make_calling_record(name=func.__name__, arguments=args_repr)
             try:
                 result = func(*args, **kwargs)
                 self._make_done_record(func.__name__, result)
             except BaseException as e:
                 if isinstance(e, tuple(self.blacklisted_exceptions)):
                     raise
+                arguments = args_repr if self.log_call_args_on_exc else ''
                 self._logger.log(
                     level=self.exc_level,
                     msg="Failed: \n{name!r}({arguments})".format(
                         name=func.__name__,
-                        arguments=args_repr,
+                        arguments=arguments,
                     ),
                     exc_info=True
                 )
@@ -109,6 +104,7 @@ def wrapper(*args, **kwargs):
         return wrapper
 
 
+# pylint: disable=unexpected-keyword-arg
 def logwrap(
     log=_log_wrap_shared.logger,
     log_level=logging.DEBUG,
@@ -163,3 +159,4 @@ def logwrap(
         log_call_args_on_exc=log_call_args_on_exc,
         log_result_obj=log_result_obj
     )
+# pylint: enable=unexpected-keyword-arg

logwrap/_log_wrap_shared.py

@@ -42,6 +42,7 @@
 def _check_type(expected):
     def deco(func):
         """Check type before asign."""
+        # pylint: disable=missing-docstring
         @functools.wraps(func)
         def wrapper(self, val):
             if not isinstance(val, expected):
@@ -52,6 +53,8 @@ def wrapper(self, val):
                     )
                 )
             return func(self, val)
+
+        # pylint: enable=missing-docstring
         return wrapper
     return deco
 
@@ -63,10 +66,13 @@ def wraps(
         updated=functools.WRAPPER_UPDATES
     ):
         """Backport of functools.wraps to older python versions."""
+        # pylint: disable=missing-docstring
         def wrapper(f):
             f = functools.wraps(wrapped, assigned, updated)(f)
             f.__wrapped__ = wrapped
             return f
+
+        # pylint: enable=missing-docstring
         return wrapper
 else:
     wraps = functools.wraps
@@ -154,6 +160,8 @@ def __init__(
 
         self.__wrap_func_self()
 
+        super(BaseLogWrap, self).__init__()
+
     def __wrap_func_self(self):
         """Mark self as function wrapper. Usd only without arguments."""
         if self.__func is not None:
@@ -319,6 +327,17 @@ def _make_done_record(self, func_name, result):
             msg=msg
         )
 
+    def _make_calling_record(self, name, arguments, method='Calling'):
+        """Make log record before execution."""
+        self._logger.log(
+            level=self.log_level,
+            msg="{method}: \n{name!r}({arguments})".format(
+                method=method,
+                name=name,
+                arguments=arguments if self.log_call_args else ''
+            )
+        )
+
     @abc.abstractmethod
     def _get_function_wrapper(self, func):
         """Here should be constructed and returned real decorator.