diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-04 10:45:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 10:45:22 +0100 |
| commit | 725a72ec5a6b9fb8dd6e46c63566086923c12029 (patch) | |
| tree | aba825f9077fd1d945d7f5b3381e9d54cb5203b5 | |
| parent | Merge pull request #3044 from matrix-org/michaelk/performance_stats (diff) | |
| parent | replace old style error catching with 'as' keyword (diff) | |
| download | synapse-725a72ec5a6b9fb8dd6e46c63566086923c12029.tar.xz | |
Merge pull request #3000 from NotAFile/change-except-style
Replace old style error catching with 'as' keyword
Diffstat (limited to '')
| -rwxr-xr-x | synapse/app/synctl.py | 4 | ||||
| -rw-r--r-- | synapse/handlers/device.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py index 0f0ddfa78a..b0e1b5e66a 100755 --- a/synapse/app/synctl.py +++ b/synapse/app/synctl.py @@ -38,7 +38,7 @@ def pid_running(pid): try: os.kill(pid, 0) return True - except OSError, err: + except OSError as err: if err.errno == errno.EPERM: return True return False @@ -98,7 +98,7 @@ def stop(pidfile, app): try: os.kill(pid, signal.SIGTERM) write("stopped %s" % (app,), colour=GREEN) - except OSError, err: + except OSError as err: if err.errno == errno.ESRCH: write("%s not running" % (app,), colour=YELLOW) elif err.errno == errno.EPERM: diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 40f3d24678..f7457a7082 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -155,7 +155,7 @@ class DeviceHandler(BaseHandler): try: yield self.store.delete_device(user_id, device_id) - except errors.StoreError, e: + except errors.StoreError as e: if e.code == 404: # no match pass @@ -204,7 +204,7 @@ class DeviceHandler(BaseHandler): try: yield self.store.delete_devices(user_id, device_ids) - except errors.StoreError, e: + except errors.StoreError as e: if e.code == 404: # no match pass @@ -243,7 +243,7 @@ class DeviceHandler(BaseHandler): new_display_name=content.get("display_name") ) yield self.notify_device_update(user_id, [device_id]) - except errors.StoreError, e: + except errors.StoreError as e: if e.code == 404: raise errors.NotFoundError() else: |