Skip to content

Commit 0d9a32b

Browse files
move config.py and __main__.py to chronogram directory, need to do this for proper docker files
1 parent c2483f1 commit 0d9a32b

File tree

15 files changed

+20
-19
lines changed

15 files changed

+20
-19
lines changed

Diff for: __main__.py renamed to chronogram/__main__.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
from aiogram import Dispatcher
44
from aiogram.fsm.storage.memory import MemoryStorage
55
from aiogram.types import CallbackQuery
6-
from config import config
7-
from chronogram.middlewares import StructLoggingMiddleware, LocalizationMiddleware, L10N
8-
from chronogram.database import async_main as init_postgresql
9-
from chronogram.handlers import routers
10-
from chronogram.background_workers.timecapsule_sender import (
6+
from .middlewares import StructLoggingMiddleware, LocalizationMiddleware, L10N
7+
from .database import async_main as init_postgresql
8+
from .handlers import routers
9+
from .background_workers.timecapsule_sender import (
1110
KeepOrDeleteCallback,
1211
process_selection,
1312
)
14-
from chronogram.background_workers import (
13+
from .background_workers import (
1514
subscription_revoker,
1615
deliver_timecapsules,
1716
deadline_notificator,
1817
)
1918

19+
from config import config
20+
2021

2122
async def main():
2223
await init_postgresql()

Diff for: chronogram/background_workers/subscription_revoker.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from ..database import requests as db_req
44
from ..middlewares.l10n_data import LOC
55

6-
from config import config
6+
from ..config import config
77

88

99
async def deadline_notificator():

Diff for: chronogram/background_workers/timecapsule_sender.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ..database.requests import TimeCapsuleDatabaseActions as TC
1515
from ..utils import user_space_remaining_percent
1616

17-
from config import config
17+
from ..config import config
1818

1919

2020
class KeepOrDeleteCallback(CallbackData, prefix="keep_or_delete"):

Diff for: config.py renamed to chronogram/config.py

File renamed without changes.

Diff for: chronogram/database/requests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from .schema import ChronogramUser, TimeCapsule, ChronogramPayment
1616
from .schema import tc_image_data
1717

18-
from config import config
18+
from ..config import config
1919

2020

2121
fernet = config.FERNET

Diff for: chronogram/database/schema.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
1212
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
1313

14-
from config import config
14+
from ..config import config
1515

1616
engine = create_async_engine(
1717
f"postgresql+asyncpg://"

Diff for: chronogram/handlers/admin_panel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from ..database import requests as db_req
88
from ..utils import get_default_close_button, perform_state_clear
99

10-
from config import config
10+
from ..config import config
1111

1212
admin_router = Router(name="admin_router")
1313

Diff for: chronogram/handlers/delete_everything.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from ..utils import get_default_close_button, perform_state_clear
1010
from ..middlewares import L10N
1111

12-
from config import config
12+
from ..config import config
1313

1414
delete_router = Router(name="delete_router")
1515

Diff for: chronogram/handlers/inbox/inbox_menu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from ...utils import user_space_remaining_percent, user_space_remaining_mb
1818
from ...middlewares import L10N
1919

20-
from config import config
20+
from ...config import config
2121

2222

2323
inbox_pic = FSInputFile("media/inbox_pic.jpg")

Diff for: chronogram/handlers/payments/schemas.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from ...settings_menu_models import SettingsCallback, SettingsMenuActions
1313
from ...middlewares import L10N
1414

15-
from config import config
15+
from ...config import config
1616

1717

1818
@dataclasses.dataclass

Diff for: chronogram/handlers/settings/settings_menu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from ..payments.schemas import SubscriptionMenuCallback, choose_duration_menu
1111
from .utc_picker import start_utc_picker, UtcPickerCallback
1212

13-
from config import config
13+
from ...config import config
1414

1515

1616
async def get_init_settings_msg(tg_uid, l10n: L10N) -> str:

Diff for: chronogram/handlers/timecapsule/timecapsule.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from .aiogram3_simplecalendar import SimpleCalendar, SimpleCalendarCallback
3535
from .timepicker_bigstep import process_selection, start_timepicker, TimepickerCallback
3636

37-
from config import config
37+
from ...config import config
3838

3939
timecapsule_router = Router(name="timecapsule_router")
4040

Diff for: chronogram/middlewares/l10n.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
)
1313
from .l10n_data import LOC
1414

15-
from config import config
15+
from ..config import config
1616

1717

1818
@dataclasses.dataclass

Diff for: chronogram/photo_utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io
55
from PIL import Image
66

7-
from config import config
7+
from .config import config
88

99

1010
class PhotoReader:

Diff for: chronogram/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from .database.schema import ChronogramUser
77
from .middlewares.l10n_data import LOC
88

9-
from config import config
9+
from .config import config
1010

1111

1212
async def get_default_close_button(user_lang) -> InlineKeyboardButton:

0 commit comments

Comments
 (0)