Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix relative imports so they work in both py3 and py27

Browse Source
This commit is contained in:
Mark Haines 2016-03-08 11:45:50 +00:00
parent ea72bd9600
commit 7076082ae6
17 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/push/__init__.py
View File

@ -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
)

4
synapse/push/action_generator.py
View File

@ -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
)

6
synapse/push/bulk_push_rule_evaluator.py
View File

@ -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, [])
])

4
synapse/push/push_rule_evaluator.py
View File

@ -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

2
synapse/push/pusherpool.py
View File

@ -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

2
synapse/rest/client/v1/admin.py
View File

@ -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

2
synapse/rest/client/v1/initial_sync.py
View File

@ -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

2
synapse/rest/client/v1/login.py
View File

@ -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

2
synapse/rest/client/v1/register.py
View File

@ -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

2
synapse/rest/client/v1/room.py
View File

@ -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

2
synapse/rest/client/v1/voip.py
View File

@ -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

2
synapse/storage/__init__.py
View File

@ -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

2
synapse/storage/end_to_end_keys.py
View File

@ -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):

2
synapse/storage/events.py
View File

@ -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

2
synapse/storage/keys.py
View File

@ -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

2
synapse/storage/media_repository.py
View File

@ -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):

2
synapse/storage/signatures.py
View File

@ -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