Skip to content

Commit 2e81c88

Browse files
vlad-ed-gitvlad-ed-git
committed
refactor: switched to relative imports
1 parent fbc9a7d commit 2e81c88

File tree

25 files changed

+115
-122
lines changed

25 files changed

+115
-122
lines changed

‎tuttle/app/clients/data_source.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from typing import List, Optional, Type, Union
22

3-
from core.abstractions import SQLModelDataSourceMixin
4-
from core.intent_result import IntentResult
3+
from ..core.abstractions import SQLModelDataSourceMixin
4+
from ..core.intent_result import IntentResult
55

6-
from tuttle.model import Client
6+
from ...model import Client
77

88

99
class ClientDataSource(SQLModelDataSourceMixin):

‎tuttle/app/contacts/data_source.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from typing import List, Union
22

3-
from core.abstractions import SQLModelDataSourceMixin
4-
from core.intent_result import IntentResult
3+
from ..core.abstractions import SQLModelDataSourceMixin
4+
from ..core.intent_result import IntentResult
55
from loguru import logger
66
from sqlalchemy.exc import IntegrityError
77

8-
from tuttle.model import Contact
8+
from ...model import Contact
99

1010

1111
class ContactDataSource(SQLModelDataSourceMixin):

‎tuttle/app/contacts/intent.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from typing import Mapping, Union
22

3-
from core.intent_result import IntentResult
4-
from core.abstractions import Intent
3+
from ..core.intent_result import IntentResult
4+
from ..core.abstractions import Intent
55

6-
from tuttle.model import Contact
6+
from ...model import Contact
77

88
from .data_source import ContactDataSource
99

‎tuttle/app/contacts/view.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
padding,
1515
)
1616

17-
from contacts.intent import ContactsIntent
18-
from core import utils, views
19-
from core.abstractions import DialogHandler, TView, TViewParams
20-
from core.intent_result import IntentResult
21-
from res import colors, dimens, fonts, res_utils
17+
from ..contacts.intent import ContactsIntent
18+
from ..core import utils, views
19+
from ..core.abstractions import DialogHandler, TView, TViewParams
20+
from ..core.intent_result import IntentResult
21+
from ..res import colors, dimens, fonts, res_utils
2222

23-
from tuttle.model import Address, Contact
23+
from ...model import Address, Contact
2424

2525

2626
class ContactCard(UserControl):

‎tuttle/app/contracts/data_source.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import datetime
44

5-
from core.abstractions import SQLModelDataSourceMixin
6-
from core.intent_result import IntentResult
5+
from ..core.abstractions import SQLModelDataSourceMixin
6+
from ..core.intent_result import IntentResult
77

8-
from tuttle.model import Client, Contract
9-
from tuttle.time import Cycle, TimeUnit
8+
from ...model import Client, Contract
9+
from ...time import Cycle, TimeUnit
1010

1111

1212
class ContractDataSource(SQLModelDataSourceMixin):

‎tuttle/app/contracts/intent.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import datetime
44

5-
from clients.intent import ClientsIntent
6-
from contacts.intent import ContactsIntent
7-
from core.abstractions import ClientStorage, Intent
8-
from core.intent_result import IntentResult
9-
from preferences.intent import PreferencesIntent
10-
from preferences.model import PreferencesStorageKeys
11-
12-
from tuttle.model import Client, Contact, Contract
13-
from tuttle.time import Cycle, TimeUnit
5+
from ..clients.intent import ClientsIntent
6+
from ..contacts.intent import ContactsIntent
7+
from ..core.abstractions import ClientStorage, Intent
8+
from ..core.intent_result import IntentResult
9+
from ..preferences.intent import PreferencesIntent
10+
from ..preferences.model import PreferencesStorageKeys
11+
12+
from ...model import Client, Contact, Contract
13+
from ...time import Cycle, TimeUnit
1414

1515
from .data_source import ContractDataSource
1616

‎tuttle/app/core/charts.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
matplotlib.use("svg")
99
from flet import UserControl
1010

11-
from custom_flet.custom_mat_chart import CustomMatplotlibChart
12-
from res.colors import BLACK_COLOR, GRAY_COLOR, PRIMARY_COLOR, WHITE_COLOR
13-
from res.fonts import BODY_1_SIZE
11+
from ..custom_flet.custom_mat_chart import CustomMatplotlibChart
12+
from ..res.colors import GRAY_COLOR, PRIMARY_COLOR, WHITE_COLOR
13+
from ..res.fonts import BODY_1_SIZE
1414

1515

1616
class BarChart(UserControl):

‎tuttle/app/core/client_storage_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from flet import Page
77

8-
from core.abstractions import ClientStorage
8+
from ..core.abstractions import ClientStorage
99
from loguru import logger
1010

1111

‎tuttle/app/core/database_storage_impl.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from typing import Callable
22

3-
import re
43
from pathlib import Path
54

65
import sqlmodel
76
from loguru import logger
87

9-
from tuttle import demo
8+
from ... import demo
109

1110
from .abstractions import DatabaseStorage
1211

‎tuttle/app/core/models.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import warnings
22

3-
from tuttle.model import Cycle, TimeUnit
3+
from ...model import Cycle, TimeUnit
44

55
warnings.warn(
66
"wastebasket module, content will be moved to other modules",
@@ -10,13 +10,11 @@
1010

1111
from typing import Callable, Optional
1212

13-
import datetime
14-
import enum
1513
from dataclasses import dataclass
1614

1715
from flet import View
1816

19-
from tuttle.dev import deprecated
17+
from ...dev import deprecated
2018

2119

2220
@dataclass

0 commit comments

Comments
 (0)