diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
| commit | be3adfc331ef7f19b2e44b17cd06e463bff09f3a (patch) | |
| tree | 2e565f68ef2154e3882704916eae3b1e8f0c9f3c /synapse/util/logutils.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | revert 00bc979 (diff) | |
| download | synapse-be3adfc331ef7f19b2e44b17cd06e463bff09f3a.tar.xz | |
merge develop pydoc for _get_state_for_groups
Diffstat (limited to 'synapse/util/logutils.py')
| -rw-r--r-- | synapse/util/logutils.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/util/logutils.py b/synapse/util/logutils.py index 03249c5dc8..62a00189cc 100644 --- a/synapse/util/logutils.py +++ b/synapse/util/logutils.py @@ -14,13 +14,11 @@ # limitations under the License. -from inspect import getcallargs -from functools import wraps - -import logging import inspect +import logging import time - +from functools import wraps +from inspect import getcallargs _TIME_FUNC_ID = 0 |