diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 4c6c3b83a201f19993ee38ff5a2c04c553d59269..65ef1b68a3e58cc7a1c6042f79a8f4dd39ebc9a7 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -21,7 +21,7 @@ from synapse.util.logcontext import LoggingContext
from synapse.util.metrics import Measure
import synapse.util.async
-import push_rule_evaluator as push_rule_evaluator
+from .push_rule_evaluator import evaluator_for_user_id
import logging
import random
@@ -185,7 +185,7 @@ class Pusher(object):
processed = False
rule_evaluator = yield \
- push_rule_evaluator.evaluator_for_user_id(
+ evaluator_for_user_id(
self.user_id, single_event['room_id'], self.store
)
diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py
index c6c1dc769ec57af60171dc8dd854512cdfa349e5..84efcdd184f53282ac36a894da7171970b3eca74 100644
--- a/synapse/push/action_generator.py
+++ b/synapse/push/action_generator.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-import bulk_push_rule_evaluator
+from .bulk_push_rule_evaluator import evaluator_for_room_id
import logging
@@ -35,7 +35,7 @@ class ActionGenerator:
@defer.inlineCallbacks
def handle_push_actions_for_event(self, event, context, handler):
- bulk_evaluator = yield bulk_push_rule_evaluator.evaluator_for_room_id(
+ bulk_evaluator = yield evaluator_for_room_id(
event.room_id, self.hs, self.store
)
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
index 5d8be483e5a43e6c4bc7fad3bd517662966bbc1a..87d5061fb0bf17a87c22e311ac446522f3e93c3d 100644
--- a/synapse/push/bulk_push_rule_evaluator.py
+++ b/synapse/push/bulk_push_rule_evaluator.py
@@ -18,8 +18,8 @@ import ujson as json
from twisted.internet import defer
-import baserules
-from push_rule_evaluator import PushRuleEvaluatorForEvent
+from .baserules import list_with_base_rules
+from .push_rule_evaluator import PushRuleEvaluatorForEvent
from synapse.api.constants import EventTypes
@@ -39,7 +39,7 @@ def _get_rules(room_id, user_ids, store):
rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids)
rules_by_user = {
- uid: baserules.list_with_base_rules([
+ uid: list_with_base_rules([
decode_rule_json(rule_list)
for rule_list in rules_by_user.get(uid, [])
])
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 98e2a2015e3ed0a3e292220e3e87185aa3ee0a94..51f73a5b780fd7bce3ed8163ee7abee3471ffec8 100644
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-import baserules
+from .baserules import list_with_base_rules
import logging
import simplejson as json
@@ -91,7 +91,7 @@ class PushRuleEvaluator:
rule['actions'] = json.loads(raw_rule['actions'])
rules.append(rule)
- self.rules = baserules.list_with_base_rules(rules)
+ self.rules = list_with_base_rules(rules)
self.enabled_map = enabled_map
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index a05aa5f661ec29862d2e591a87a9875628a20462..772a095f8b8e1d40577232694cdd6fd9f5dd846e 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -16,7 +16,7 @@
from twisted.internet import defer
-from httppusher import HttpPusher
+from .httppusher import HttpPusher
from synapse.push import PusherConfigException
from synapse.util.logcontext import preserve_fn
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py
index e2f5eb7b29ab61a170e36357b75ae652c231730c..aa05b3f0231c339a970735a601f3f35c59cb3219 100644
--- a/synapse/rest/client/v1/admin.py
+++ b/synapse/rest/client/v1/admin.py
@@ -18,7 +18,7 @@ from twisted.internet import defer
from synapse.api.errors import AuthError, SynapseError
from synapse.types import UserID
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
import logging
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py
index ad161bdbab24bdd70679571578a73bcbd4063c12..36c352056758f989b89f7341728ba0e0f44189d7 100644
--- a/synapse/rest/client/v1/initial_sync.py
+++ b/synapse/rest/client/v1/initial_sync.py
@@ -16,7 +16,7 @@
from twisted.internet import defer
from synapse.streams.config import PaginationConfig
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
# TODO: Needs unit testing
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index c14e8af00ef1dcd739d35ef70db55682a3ec1a7a..f6902a60a81b1a7243b89dd7a4477decff1bc225 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -19,7 +19,7 @@ from synapse.api.errors import SynapseError, LoginError, Codes
from synapse.types import UserID
from synapse.http.server import finish_request
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
import simplejson as json
import urllib
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py
index 6d6d03c34ca2338124f4d5042bdcaeb444f4f10b..040a7a7ffa104c293182511a19a9f386b7ff874f 100644
--- a/synapse/rest/client/v1/register.py
+++ b/synapse/rest/client/v1/register.py
@@ -18,7 +18,7 @@ from twisted.internet import defer
from synapse.api.errors import SynapseError, Codes
from synapse.api.constants import LoginType
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
import synapse.util.stringutils as stringutils
from synapse.util.async import run_on_reactor
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index cbf3673eff5b9bcb533a4fbd3c1cee99f17afc47..4b7d198c52755496af7f449ca12e85f36963492f 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -16,7 +16,7 @@
""" This module contains REST servlets to do with rooms: /rooms/<paths> """
from twisted.internet import defer
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
from synapse.api.errors import SynapseError, Codes, AuthError
from synapse.streams.config import PaginationConfig
from synapse.api.constants import EventTypes, Membership
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py
index ec4cf8db794a88cecd3fde0a65e38fe09bcd78d7..c40442f95831bf4acc113613b610e52223e7b096 100644
--- a/synapse/rest/client/v1/voip.py
+++ b/synapse/rest/client/v1/voip.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from base import ClientV1RestServlet, client_path_patterns
+from .base import ClientV1RestServlet, client_path_patterns
import hmac
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 6f37a85d0919a2e87c144b6aac9cbbdebbef728b..168eb27b030c109d09a75c8d3d95595773c8641c 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -45,7 +45,7 @@ from .search import SearchStore
from .tags import TagsStore
from .account_data import AccountDataStore
-from util.id_generators import IdGenerator, StreamIdGenerator, ChainedIdGenerator
+from .util.id_generators import IdGenerator, StreamIdGenerator, ChainedIdGenerator
from synapse.api.constants import PresenceState
from synapse.util.caches.stream_change_cache import StreamChangeCache
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py
index 5dd32b1413e4a0eae339e70ff88c253ad6c62562..2e89066515f66c4e4277591a4a70b830da12f06e 100644
--- a/synapse/storage/end_to_end_keys.py
+++ b/synapse/storage/end_to_end_keys.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from _base import SQLBaseStore
+from ._base import SQLBaseStore
class EndToEndKeyStore(SQLBaseStore):
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 60936500d8e60115ddce7a4ceb1f5d1f2cc73c95..552e7ca35b10a7642ed0b875f444afe4c0282885 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from _base import SQLBaseStore, _RollbackButIsFineException
+from ._base import SQLBaseStore, _RollbackButIsFineException
from twisted.internet import defer, reactor
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index fd05bfe54e116c75eab17d4d2ea8289212077f75..a495a8a7d9268c2395c15989f3f0eef9e11957ce 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from _base import SQLBaseStore
+from ._base import SQLBaseStore
from synapse.util.caches.descriptors import cachedInlineCallbacks
from twisted.internet import defer
diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py
index 0894384780b03c19a086d5a217a5a4a02bfa1ddf..9d3ba324783b595bb6708641a172e3fdcc8b4b55 100644
--- a/synapse/storage/media_repository.py
+++ b/synapse/storage/media_repository.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from _base import SQLBaseStore
+from ._base import SQLBaseStore
class MediaRepositoryStore(SQLBaseStore):
diff --git a/synapse/storage/signatures.py b/synapse/storage/signatures.py
index 70c6a06cd1512fcfe2637a1675d303ecdd357e9c..b10f2a5787771703dabdabf51b6c486fc9707f75 100644
--- a/synapse/storage/signatures.py
+++ b/synapse/storage/signatures.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from _base import SQLBaseStore
+from ._base import SQLBaseStore
from unpaddedbase64 import encode_base64
from synapse.crypto.event_signing import compute_event_reference_hash