diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
| commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
| tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/rest/client/v1/pusher.py | |
| parent | Add an isort configuration (#3463) (diff) | |
| parent | changelog (diff) | |
| download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz | |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/rest/client/v1/pusher.py')
| -rw-r--r-- | synapse/rest/client/v1/pusher.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py index 40e523cc5f..1581f88db5 100644 --- a/synapse/rest/client/v1/pusher.py +++ b/synapse/rest/client/v1/pusher.py @@ -13,20 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +import logging + from twisted.internet import defer -from synapse.api.errors import SynapseError, Codes -from synapse.push import PusherConfigException +from synapse.api.errors import Codes, StoreError, SynapseError +from synapse.http.server import finish_request from synapse.http.servlet import ( - parse_json_object_from_request, parse_string, RestServlet + RestServlet, + parse_json_object_from_request, + parse_string, ) -from synapse.http.server import finish_request -from synapse.api.errors import StoreError +from synapse.push import PusherConfigException from .base import ClientV1RestServlet, client_path_patterns -import logging - logger = logging.getLogger(__name__) |