diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-18 09:56:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 09:56:44 -0400 |
| commit | 8a4a4186ded34bab1ffb4ee1cebcb476890da207 (patch) | |
| tree | 5e2979552403745d47ec76736061eec5e98ed0a5 /synapse/logging | |
| parent | Allow appservice users to /login (#8320) (diff) | |
| download | synapse-8a4a4186ded34bab1ffb4ee1cebcb476890da207.tar.xz | |
Simplify super() calls to Python 3 syntax. (#8344)
This converts calls like super(Foo, self) -> super().
Generated with:
sed -i "" -Ee 's/super\([^\(]+\)/super()/g' **/*.pyDiffstat (limited to 'synapse/logging')
| -rw-r--r-- | synapse/logging/formatter.py | 2 | ||||
| -rw-r--r-- | synapse/logging/scopecontextmanager.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/logging/formatter.py b/synapse/logging/formatter.py index d736ad5b9b..11f60a77f7 100644 --- a/synapse/logging/formatter.py +++ b/synapse/logging/formatter.py @@ -30,7 +30,7 @@ class LogFormatter(logging.Formatter): """ def __init__(self, *args, **kwargs): - super(LogFormatter, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def formatException(self, ei): sio = StringIO() diff --git a/synapse/logging/scopecontextmanager.py b/synapse/logging/scopecontextmanager.py index 026854b4c7..7b9c657456 100644 --- a/synapse/logging/scopecontextmanager.py +++ b/synapse/logging/scopecontextmanager.py @@ -107,7 +107,7 @@ class _LogContextScope(Scope): finish_on_close (Boolean): if True finish the span when the scope is closed """ - super(_LogContextScope, self).__init__(manager, span) + super().__init__(manager, span) self.logcontext = logcontext self._finish_on_close = finish_on_close self._enter_logcontext = enter_logcontext @@ -120,9 +120,9 @@ class _LogContextScope(Scope): def __exit__(self, type, value, traceback): if type == twisted.internet.defer._DefGen_Return: - super(_LogContextScope, self).__exit__(None, None, None) + super().__exit__(None, None, None) else: - super(_LogContextScope, self).__exit__(type, value, traceback) + super().__exit__(type, value, traceback) if self._enter_logcontext: self.logcontext.__exit__(type, value, traceback) else: # the logcontext existed before the creation of the scope |