Merge branch 'develop' into rav/enforce_report_api

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/util/logformatter.py b/synapse/util/logformatter.py

index 3e42868ea9..a46bc47ce3 100644
--- a/synapse/util/logformatter.py
+++ b/synapse/util/logformatter.py
@@ -14,10 +14,11 @@
 # limitations under the License.
 
 
-from six import StringIO
 import logging
 import traceback
 
+from six import StringIO
+
 
 class LogFormatter(logging.Formatter):
     """Log formatter which gives more detail for exceptions