diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-05-02 16:16:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-05-02 16:16:01 +0100 |
| commit | 415c6b672ef08f4640cf48e80b62ca508e45279b (patch) | |
| tree | d2e1598e8258c33bac7f370c3e703b7c14403a52 /synapse | |
| parent | Remove spurious unittest.DEBUG (diff) | |
| parent | Merge pull request #3172 from matrix-org/rav/fix_test_logcontext_leaks (diff) | |
| download | synapse-415c6b672ef08f4640cf48e80b62ca508e45279b.tar.xz | |
Merge branch 'develop' into rav/more_logcontext_leaks
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/util/logformatter.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 4924f44d4e..f31cb9a3cb 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.28.0" +__version__ = "0.28.1" diff --git a/synapse/util/logformatter.py b/synapse/util/logformatter.py index 59ab3c6968..3e42868ea9 100644 --- a/synapse/util/logformatter.py +++ b/synapse/util/logformatter.py @@ -32,7 +32,7 @@ class LogFormatter(logging.Formatter): super(LogFormatter, self).__init__(*args, **kwargs) def formatException(self, ei): - sio = StringIO.StringIO() + sio = StringIO() (typ, val, tb) = ei # log the stack above the exception capture point if possible, but |