From e0ee4eade7e06d75e4332f9a8fd2672f34f9057c Mon Sep 17 00:00:00 2001 From: Dmitry Afanasyev Date: Tue, 16 Aug 2022 13:26:51 +0300 Subject: [PATCH] change app to core imports --- app/core/bot.py | 8 ++------ app/core/parse_web.py | 4 ++-- app/core/scheduler.py | 2 +- app/main.py | 8 ++++---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/core/bot.py b/app/core/bot.py index 6f54369..c82bc88 100644 --- a/app/core/bot.py +++ b/app/core/bot.py @@ -5,12 +5,8 @@ from aiogram.contrib.middlewares.logging import LoggingMiddleware from aiogram.dispatcher import Dispatcher from aiogram.dispatcher.webhook import SendMessage from aiogram.utils.callback_data import CallbackData -from app.core.parse_web import ( - configure_firefox_driver, - download_gecko_driver, - parse_site, -) -from app.settings import API_TOKEN +from core.parse_web import configure_firefox_driver, download_gecko_driver, parse_site +from settings import API_TOKEN bot = Bot(token=API_TOKEN) dispatcher = Dispatcher(bot) diff --git a/app/core/parse_web.py b/app/core/parse_web.py index 49ff684..7c4e304 100644 --- a/app/core/parse_web.py +++ b/app/core/parse_web.py @@ -4,13 +4,13 @@ import time from pathlib import Path import wget -from app.core.logger import logger -from app.settings import BASE_DIR, GECKO_DRIVER_VERSION +from core.logger import logger from selenium import webdriver from selenium.common.exceptions import NoSuchElementException, WebDriverException from selenium.webdriver.firefox import options from selenium.webdriver.firefox.service import Service from selenium.webdriver.firefox.webdriver import WebDriver +from settings import BASE_DIR, GECKO_DRIVER_VERSION def download_gecko_driver() -> None: diff --git a/app/core/scheduler.py b/app/core/scheduler.py index de5ccd2..c53deb6 100644 --- a/app/core/scheduler.py +++ b/app/core/scheduler.py @@ -1,4 +1,4 @@ -from app.core.bot import morning_bus_mailing +from core.bot import morning_bus_mailing cron_jobs = [ {'trigger': 'cron', 'day_of_week': 'mon-fri', 'hour': 8, 'minute': 59, 'second': 0}, diff --git a/app/main.py b/app/main.py index b478a86..c5e6528 100644 --- a/app/main.py +++ b/app/main.py @@ -4,10 +4,10 @@ from aiogram import Bot, Dispatcher from aiogram.types import Update from aiogram.utils.executor import start_polling, start_webhook from aiohttp import web -from app.core.bot import bot, dispatcher -from app.core.logger import logger -from app.core.scheduler import asyncio_schedule -from app.settings import ( +from core.bot import bot, dispatcher +from core.logger import logger +from core.scheduler import asyncio_schedule +from settings import ( START_WITH_WEBHOOK, WEBAPP_HOST, WEBAPP_PORT,