Skip to content

Commit ad512c9

Browse files
ccrisanccrisan
committed
core/expressions: Move functions to dedicated package
1 parent 76155b2 commit ad512c9

14 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎qtoggleserver/core/expressions/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ def parse(self_port_id: str | None, sexpression: str, role: Role, pos: int = 1)
6262
return LiteralValue.parse(self_port_id, sexpression, role, pos)
6363

6464

65-
from . import ( # noqa: E402
65+
from .functions import ( # noqa: E402
66+
Function, # noqa: E402
6667
aggregation,
6768
arithmetic,
6869
bitwise,
@@ -76,5 +77,4 @@ def parse(self_port_id: str | None, sexpression: str, role: Role, pos: int = 1)
7677
timeprocessing,
7778
various,
7879
)
79-
from .functions import Function # noqa: E402
8080
from .ports import PortExpression # noqa: E402

qtoggleserver/core/expressions/functions.py renamed to qtoggleserver/core/expressions/functions/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
from collections.abc import Callable
66

7-
from . import DEP_ASAP, exceptions, parse
8-
from .base import EvalContext, EvalResult, Expression, Role
9-
from .literalvalues import LiteralValue
10-
from .ports import PortValue
7+
from .. import DEP_ASAP, exceptions, parse
8+
from ..base import EvalContext, EvalResult, Expression, Role
9+
from ..literalvalues import LiteralValue
10+
from ..ports import PortValue
1111

1212

1313
FUNCTIONS = {}

qtoggleserver/core/expressions/aggregation.py renamed to qtoggleserver/core/expressions/functions/aggregation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import EvalContext, EvalResult
2-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from . import Function, function
33

44

55
@function("MIN")

qtoggleserver/core/expressions/arithmetic.py renamed to qtoggleserver/core/expressions/functions/arithmetic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from .base import EvalContext, EvalResult
2-
from .exceptions import ExpressionArithmeticError
3-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from ..exceptions import ExpressionArithmeticError
3+
from . import Function, function
44

55

66
@function("ADD")

qtoggleserver/core/expressions/bitwise.py renamed to qtoggleserver/core/expressions/functions/bitwise.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import EvalContext, EvalResult
2-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from . import Function, function
33

44

55
@function("BITAND")

qtoggleserver/core/expressions/branching.py renamed to qtoggleserver/core/expressions/functions/branching.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import EvalContext, EvalResult
2-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from . import Function, function
33

44

55
@function("IF")

qtoggleserver/core/expressions/comparison.py renamed to qtoggleserver/core/expressions/functions/comparison.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import EvalContext, EvalResult
2-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from . import Function, function
33

44

55
@function("EQ")

qtoggleserver/core/expressions/date.py renamed to qtoggleserver/core/expressions/functions/date.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
from qtoggleserver import system
77

8-
from .base import DEP_ASAP, DEP_DAY, DEP_HOUR, DEP_MINUTE, DEP_MONTH, DEP_SECOND, DEP_YEAR, EvalContext, EvalResult
9-
from .exceptions import InvalidArgumentValue, RealDateTimeUnavailable
10-
from .functions import Function, function
8+
from ..base import DEP_ASAP, DEP_DAY, DEP_HOUR, DEP_MINUTE, DEP_MONTH, DEP_SECOND, DEP_YEAR, EvalContext, EvalResult
9+
from ..exceptions import InvalidArgumentValue, RealDateTimeUnavailable
10+
from . import Function, function
1111

1212

1313
class DateUnitFunction(Function, metaclass=abc.ABCMeta):

qtoggleserver/core/expressions/logic.py renamed to qtoggleserver/core/expressions/functions/logic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from .base import EvalContext, EvalResult
2-
from .functions import Function, function
1+
from ..base import EvalContext, EvalResult
2+
from . import Function, function
33

44

55
@function("AND")

qtoggleserver/core/expressions/rounding.py renamed to qtoggleserver/core/expressions/functions/rounding.py

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

3-
from .base import EvalContext, EvalResult
4-
from .functions import Function, function
3+
from ..base import EvalContext, EvalResult
4+
from . import Function, function
55

66

77
@function("FLOOR")

0 commit comments

Comments
 (0)