diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-15 19:17:06 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-15 19:37:41 +0100 |
| commit | d4676910c91dd492ca5cc7c207969fa7bfe1bbee (patch) | |
| tree | c2dc156b782c596f7f8393324058e749c120af30 /synapse/logging | |
| parent | remove `builtins.buffer` code from storage code (diff) | |
| download | synapse-d4676910c91dd492ca5cc7c207969fa7bfe1bbee.tar.xz | |
remove miscellaneous PY2 code
Diffstat (limited to 'synapse/logging')
| -rw-r--r-- | synapse/logging/utils.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/synapse/logging/utils.py b/synapse/logging/utils.py index 0c2527bd86..99049bb5d8 100644 --- a/synapse/logging/utils.py +++ b/synapse/logging/utils.py @@ -20,8 +20,6 @@ import time from functools import wraps from inspect import getcallargs -from six import PY3 - _TIME_FUNC_ID = 0 @@ -30,12 +28,8 @@ def _log_debug_as_f(f, msg, msg_args): logger = logging.getLogger(name) if logger.isEnabledFor(logging.DEBUG): - if PY3: - lineno = f.__code__.co_firstlineno - pathname = f.__code__.co_filename - else: - lineno = f.func_code.co_firstlineno - pathname = f.func_code.co_filename + lineno = f.__code__.co_firstlineno + pathname = f.__code__.co_filename record = logging.LogRecord( name=name, |