From e6fc4ae27d1c036b2a42a1d8f9f9b9018fb70e95 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 23 Jan 2017 22:28:24 -0800 Subject: [PATCH] errors: Move zilencer/error_notify.py to zerver/lib/. --- {zilencer => zerver/lib}/error_notify.py | 10 +++++----- zilencer/views.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename {zilencer => zerver/lib}/error_notify.py (98%) diff --git a/zilencer/error_notify.py b/zerver/lib/error_notify.py similarity index 98% rename from zilencer/error_notify.py rename to zerver/lib/error_notify.py index 43d3bafe40..cf9b2285bf 100644 --- a/zilencer/error_notify.py +++ b/zerver/lib/error_notify.py @@ -1,15 +1,15 @@ from __future__ import absolute_import -from collections import defaultdict -from typing import Any -import logging +import logging +import six + +from collections import defaultdict from django.conf import settings from django.core.mail import mail_admins +from typing import Any, Dict from zerver.models import get_user_profile_by_email from zerver.lib.actions import internal_send_message -from typing import Dict -import six def format_subject(subject): # type: (str) -> str diff --git a/zilencer/views.py b/zilencer/views.py index 4e64be531f..a0851f0d23 100644 --- a/zilencer/views.py +++ b/zilencer/views.py @@ -10,12 +10,12 @@ from zilencer.models import Deployment from zerver.decorator import has_request_variables, REQ from zerver.lib.actions import internal_send_message +from zerver.lib.error_notify import notify_browser_error, notify_server_error from zerver.lib.redis_utils import get_redis_client from zerver.lib.response import json_success, json_error, json_response from zerver.lib.validator import check_dict from zerver.models import get_realm, get_user_profile_by_email, \ get_realm_by_email_domain, UserProfile, Realm -from .error_notify import notify_server_error, notify_browser_error import time