summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-08 11:08:20 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-08 11:08:20 +0000
commitea72bd960052f95599150a287a7fccbe668e2c23 (patch)
tree8ca401db42e800c7393fb3df3919bf754b918786 /synapse/config/_base.py
parentMerge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id (diff)
parentUse syntax that works on both py2.7 and py3 (diff)
downloadsynapse-ea72bd960052f95599150a287a7fccbe668e2c23.tar.xz
Merge pull request #631 from matrix-org/markjh/py3v1
Use syntax that's valid on both py2.7 and py3
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 15d78ff33a..7449f36491 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -104,7 +104,7 @@ class Config(object):
         dir_path = cls.abspath(dir_path)
         try:
             os.makedirs(dir_path)
-        except OSError, e:
+        except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
         if not os.path.isdir(dir_path):