This commit is contained in:
Erik Johnston 2015-04-07 12:16:05 +01:00
parent 6bc9edd8b2
commit 0bfa78b39b
6 changed files with 2 additions and 13 deletions

View File

@ -17,9 +17,7 @@
import sys import sys
sys.dont_write_bytecode = True sys.dont_write_bytecode = True
from synapse.storage import ( from synapse.storage import UpgradeDatabaseException
prepare_database, UpgradeDatabaseException,
)
from synapse.storage.engines import create_engine from synapse.storage.engines import create_engine
from synapse.server import HomeServer from synapse.server import HomeServer
@ -60,7 +58,6 @@ import os
import re import re
import resource import resource
import subprocess import subprocess
import sqlite3
import yaml import yaml

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from twisted.internet import defer
from .appservice import ApplicationServiceStore from .appservice import ApplicationServiceStore
from .directory import DirectoryStore from .directory import DirectoryStore
from .events import EventsStore from .events import EventsStore
@ -43,8 +41,6 @@ import logging
import os import os
import re import re
import threading
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -105,7 +105,6 @@ class RegistrationStore(SQLBaseStore):
defer.returnValue(user_info) defer.returnValue(user_info)
@cached() @cached()
# TODO(paul): Currently there's no code to invalidate this cache. That # TODO(paul): Currently there's no code to invalidate this cache. That
# means if/when we ever add internal ways to invalidate access tokens or # means if/when we ever add internal ways to invalidate access tokens or

View File

@ -40,7 +40,6 @@ class RoomMemberStore(SQLBaseStore):
""" """
try: try:
target_user_id = event.state_key target_user_id = event.state_key
domain = UserID.from_string(target_user_id).domain
except: except:
logger.exception( logger.exception(
"Failed to parse target_user_id=%s", target_user_id "Failed to parse target_user_id=%s", target_user_id

View File

@ -159,4 +159,3 @@ class StateStore(SQLBaseStore):
def _make_group_id(clock): def _make_group_id(clock):
return str(int(clock.time_msec())) + random_string(5) return str(int(clock.time_msec())) + random_string(5)

View File

@ -375,4 +375,3 @@ class DestinationsTable(object):
"retry_last_ts", "retry_last_ts",
"retry_interval", "retry_interval",
] ]