From c56562e7eaca20e8ff95747a6024e684a2a8ae40 Mon Sep 17 00:00:00 2001 From: Oleg Silkin Date: Sun, 4 Aug 2019 17:47:11 -0400 Subject: [PATCH] Import formats --- src/database/writes.py | 12 ++++++------ src/server/handles.py | 13 +++++++------ tests/database_test.py | 11 +++++++---- tests/testcase.py | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/database/writes.py b/src/database/writes.py index 7fe99c2..df0d950 100644 --- a/src/database/writes.py +++ b/src/database/writes.py @@ -3,14 +3,14 @@ import sqlite3 from asyncio import coroutine -from database.queries import delete_comment_by_id +from src.database.queries import delete_comment_by_id from src.server.misc import is_authentic_delete_signal, request_lbrynet, validate_signature_from_claim -from database.queries import get_comment_or_none -from database.queries import insert_comment -from database.queries import insert_channel -from database.queries import get_channel_id_from_comment_id -from database.queries import hide_comment_by_id +from src.database.queries import get_comment_or_none +from src.database.queries import insert_comment +from src.database.queries import insert_channel +from src.database.queries import get_channel_id_from_comment_id +from src.database.queries import hide_comment_by_id from src.server.misc import channel_matches_pattern_or_error logger = logging.getLogger(__name__) diff --git a/src/server/handles.py b/src/server/handles.py index 0ce8349..af765ba 100644 --- a/src/server/handles.py +++ b/src/server/handles.py @@ -7,15 +7,16 @@ from aiohttp import web from aiojobs.aiohttp import atomic from src.server.misc import clean_input_params -from database.queries import get_claim_comments -from database.queries import get_comments_by_id, get_comment_ids -from database.queries import get_channel_id_from_comment_id +from src.database.queries import get_claim_comments +from src.database.queries import get_comments_by_id, get_comment_ids +from src.database.queries import get_channel_id_from_comment_id +from src.database.queries import get_hidden_claim_comments from src.server.misc import is_valid_base_comment from src.server.misc import is_valid_credential_input from src.server.misc import make_error -from database.writes import delete_comment_if_authorized -from database.writes import write_comment -from database.writes import hide_comment_if_authorized +from src.database.writes import delete_comment_if_authorized +from src.database.writes import write_comment +from src.database.writes import hide_comment_if_authorized logger = logging.getLogger(__name__) diff --git a/tests/database_test.py b/tests/database_test.py index 3de9312..4d9068c 100644 --- a/tests/database_test.py +++ b/tests/database_test.py @@ -5,10 +5,13 @@ from faker.providers import internet from faker.providers import lorem from faker.providers import misc -from database.queries import get_comments_by_id -from database.queries import get_comment_ids -from database.queries import get_claim_comments -from database.writes import create_comment_or_error +from src.database.queries import get_comments_by_id +from src.database.queries import get_comment_ids +from src.database.queries import get_claim_comments +from src.database.queries import get_hidden_claim_comments +from src.database.writes import create_comment_or_error +from src.database.queries import hide_comment_by_id +from src.database.queries import delete_comment_by_id from tests.testcase import DatabaseTestCase fake = faker.Faker() diff --git a/tests/testcase.py b/tests/testcase.py index 2357347..ddd8b44 100644 --- a/tests/testcase.py +++ b/tests/testcase.py @@ -6,7 +6,7 @@ from unittest.case import _Outcome import asyncio -from database.queries import obtain_connection, setup_database +from src.database.queries import obtain_connection, setup_database class AsyncioTestCase(unittest.TestCase):