Import HomeServer from the proper module. (#9665)

This commit is contained in:
Patrick Cloke 2021-03-23 07:12:48 -04:00 committed by GitHub
parent 5b268997bd
commit b7748d3c00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 59 additions and 58 deletions

1
changelog.d/9665.misc Normal file
View File

@ -0,0 +1 @@
Import `HomeServer` from the proper module.

View File

@ -57,7 +57,7 @@ from synapse.util.metrics import Measure
from synapse.util.retryutils import NotRetryingDestination
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -62,7 +62,7 @@ from synapse.util.caches.expiringcache import ExpiringCache
from synapse.util.retryutils import NotRetryingDestination
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -46,7 +46,7 @@ from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.types import JsonDict, get_domain_from_id
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -25,7 +25,7 @@ from synapse.types import GroupID, JsonDict, RoomID, UserID, get_domain_from_id
from synapse.util.async_helpers import concurrently_execute
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -24,7 +24,7 @@ from synapse.api.ratelimiting import Ratelimiter
from synapse.types import UserID
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -25,7 +25,7 @@ from synapse.replication.http.account_data import (
from synapse.types import JsonDict, UserID
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
class AccountDataHandler:

View File

@ -27,7 +27,7 @@ from synapse.types import UserID
from synapse.util import stringutils
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -24,7 +24,7 @@ from twisted.web.resource import Resource
from synapse.app import check_bind_error
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -25,7 +25,7 @@ from synapse.visibility import filter_events_for_client
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -38,7 +38,7 @@ from synapse.types import Collection, JsonDict, RoomAlias, RoomStreamToken, User
from synapse.util.metrics import Measure
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -70,7 +70,7 @@ from synapse.util.msisdn import phone_number_to_msisdn
from synapse.util.threepids import canonicalise_email
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -27,7 +27,7 @@ from synapse.http.site import SynapseRequest
from synapse.types import UserID, map_username_to_mxid_localpart
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -23,7 +23,7 @@ from synapse.types import Requester, UserID, create_requester
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -45,7 +45,7 @@ from synapse.util.retryutils import NotRetryingDestination
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -32,7 +32,7 @@ from synapse.util import json_encoder
from synapse.util.stringutils import random_string
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -42,7 +42,7 @@ from synapse.util.caches.expiringcache import ExpiringCache
from synapse.util.retryutils import NotRetryingDestination
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -29,7 +29,7 @@ from synapse.types import JsonDict
from synapse.util.async_helpers import Linearizer
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ from synapse.api.errors import HttpResponseException, RequestSendFailed, Synapse
from synapse.types import GroupID, JsonDict, get_domain_from_id
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ from typing import TYPE_CHECKING
from synapse.api.errors import Codes, PasswordRefusedError
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -36,7 +36,7 @@ from synapse.types import (
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ from synapse.util.async_helpers import Linearizer
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -20,7 +20,7 @@ from synapse.handlers._base import BaseHandler
from synapse.types import JsonDict, ReadReceipt, get_domain_from_id
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -38,7 +38,7 @@ from synapse.types import RoomAlias, UserID, create_requester
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -29,7 +29,7 @@ from synapse.util.caches.response_cache import ResponseCache
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -26,7 +26,7 @@ from synapse.replication.http.membership import (
from synapse.types import Requester, UserID
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -30,7 +30,7 @@ from synapse.visibility import filter_events_for_client
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ from synapse.types import Requester
from ._base import BaseHandler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -17,7 +17,7 @@ import logging
from typing import TYPE_CHECKING, Optional
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -24,7 +24,7 @@ from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.types import JsonDict
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -25,7 +25,7 @@ from synapse.types import JsonDict
from synapse.util.metrics import Measure
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -77,7 +77,7 @@ from synapse.util import json_decoder
from synapse.util.async_helpers import timeout_deferred
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -21,7 +21,7 @@ import attr
from synapse.types import JsonDict, RoomStreamToken
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
@attr.s(slots=True)

View File

@ -22,7 +22,7 @@ from synapse.push.bulk_push_rule_evaluator import BulkPushRuleEvaluator
from synapse.util.metrics import Measure
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -33,7 +33,7 @@ from synapse.util.caches.lrucache import LruCache
from .push_rule_evaluator import PushRuleEvaluatorForEvent
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -24,7 +24,7 @@ from synapse.push import Pusher, PusherConfig, ThrottleParams
from synapse.push.mailer import Mailer
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -31,7 +31,7 @@ from synapse.push import Pusher, PusherConfig, PusherConfigException
from . import push_rule_evaluator, push_tools
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -40,7 +40,7 @@ from synapse.util.async_helpers import concurrently_execute
from synapse.visibility import filter_events_for_client
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -22,7 +22,7 @@ from synapse.push.httppusher import HttpPusher
from synapse.push.mailer import Mailer
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -24,7 +24,7 @@ from ._base import BaseSlavedStore
from ._slaved_id_tracker import SlavedIdTracker
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
class SlavedPusherStore(PusherWorkerStore, BaseSlavedStore):

View File

@ -33,7 +33,7 @@ import attr
from synapse.replication.http.streams import ReplicationGetStreamUpdates
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -28,7 +28,7 @@ from synapse.rest.admin._base import (
from synapse.types import JsonDict
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -58,7 +58,7 @@ from synapse.util import json_decoder
from synapse.util.stringutils import parse_and_validate_server_name, random_string
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -45,7 +45,7 @@ from synapse.util.threepids import canonicalise_email, check_3pid_allowed
from ._base import client_patterns, interactive_auth_handler
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -38,7 +38,7 @@ from synapse.types import GroupID, JsonDict
from ._base import client_patterns
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -23,7 +23,7 @@ from synapse.http.server import DirectServeJsonResource, respond_with_json
from synapse.http.site import SynapseRequest
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
class MediaConfigResource(DirectServeJsonResource):

View File

@ -24,8 +24,8 @@ from synapse.http.servlet import parse_boolean
from ._base import parse_media_id, respond_404
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.rest.media.v1.media_repository import MediaRepository
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -58,7 +58,7 @@ from .thumbnailer import Thumbnailer, ThumbnailError
from .upload_resource import UploadResource
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -54,8 +54,8 @@ from ._base import FileInfo
if TYPE_CHECKING:
from lxml import etree
from synapse.app.homeserver import HomeServer
from synapse.rest.media.v1.media_repository import MediaRepository
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -29,7 +29,7 @@ from .media_storage import FileResponder
logger = logging.getLogger(__name__)
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
class StorageProvider(metaclass=abc.ABCMeta):

View File

@ -34,8 +34,8 @@ from ._base import (
)
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.rest.media.v1.media_repository import MediaRepository
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -26,8 +26,8 @@ from synapse.http.site import SynapseRequest
from synapse.rest.media.v1.media_storage import SpamMediaException
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.rest.media.v1.media_repository import MediaRepository
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -36,7 +36,7 @@ from synapse.storage.purge_events import PurgeEventsStorage
from synapse.storage.state import StateGroupStorage
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
__all__ = ["Databases", "DataStore"]

View File

@ -27,7 +27,7 @@ from synapse.types import Collection, StreamToken, get_domain_from_id
from synapse.util import json_decoder
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -23,7 +23,7 @@ from synapse.util import json_encoder
from . import engines
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
from synapse.storage.database import DatabasePool, LoggingTransaction
logger = logging.getLogger(__name__)

View File

@ -32,7 +32,7 @@ from synapse.types import JsonDict
from synapse.util import json_encoder
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -27,7 +27,7 @@ from synapse.util import json_encoder
from synapse.util.caches.descriptors import cached, cachedList
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -20,7 +20,7 @@ from typing import TYPE_CHECKING, Set
from synapse.storage.databases import Databases
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
logger = logging.getLogger(__name__)

View File

@ -32,7 +32,7 @@ from synapse.events import EventBase
from synapse.types import MutableStateMap, StateMap
if TYPE_CHECKING:
from synapse.app.homeserver import HomeServer
from synapse.server import HomeServer
from synapse.storage.databases import Databases
logger = logging.getLogger(__name__)