From e6faadc815dcf5db8132a9d5e6dd6df9c7170cb8 Mon Sep 17 00:00:00 2001 From: gonzo Date: Tue, 20 Aug 2024 17:32:33 +0200 Subject: [PATCH] undo event.py imports re-organization as it causes circular dependencies --- eventkit/event.py | 166 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 82 deletions(-) diff --git a/eventkit/event.py b/eventkit/event.py index f98b75e..5b771d1 100644 --- a/eventkit/event.py +++ b/eventkit/event.py @@ -5,88 +5,6 @@ from typing import Any as AnyType from typing import AsyncIterable, Awaitable, Iterable, List, Optional, Tuple, Union -from .ops.aggregate import ( - All, - Any, - Count, - Deque, - Ema, - Max, - Mean, - Min, - Pairwise, - Product, - Reduce, - Sum, -) -from .ops.aggregate import List as ListOp -from .ops.array import ( - Array, - ArrayAll, - ArrayAny, - ArrayMax, - ArrayMean, - ArrayMin, - ArrayProd, - ArrayStd, - ArraySum, -) -from .ops.combine import ( - AddableJoinOp, - Chain, - Concat, - Fork, - Merge, - Switch, - Zip, - Ziplatest, -) -from .ops.create import ( - Aiterate, - Marble, - Range, - Repeat, - Sequence, - Timer, - Timerange, - Wait, -) -from .ops.misc import EndOnError, Errors -from .ops.op import Op -from .ops.select import ( - Changes, - DropWhile, - Filter, - Last, - Skip, - Take, - TakeUntil, - TakeWhile, - Unique, -) -from .ops.timing import Debounce, Delay, Sample, Throttle, Timeout -from .ops.transform import ( - Chainmap, - Chunk, - ChunkWith, - Concatmap, - Constant, - Copy, - Deepcopy, - Emap, - Enumerate, - Iterate, - Map, - Mergemap, - Pack, - Partial, - PartialRight, - Pluck, - Previous, - Star, - Switchmap, - Timestamp, -) from .util import NO_VALUE, get_event_loop @@ -1444,3 +1362,87 @@ def end_on_error(self) -> "EndOnError": End on any error from the source. """ return EndOnError(self) + + +from .ops.aggregate import ( + All, + Any, + Count, + Deque, + Ema, + Max, + Mean, + Min, + Pairwise, + Product, + Reduce, + Sum, +) +from .ops.aggregate import List as ListOp +from .ops.array import ( + Array, + ArrayAll, + ArrayAny, + ArrayMax, + ArrayMean, + ArrayMin, + ArrayProd, + ArrayStd, + ArraySum, +) +from .ops.combine import ( + AddableJoinOp, + Chain, + Concat, + Fork, + Merge, + Switch, + Zip, + Ziplatest, +) +from .ops.create import ( + Aiterate, + Marble, + Range, + Repeat, + Sequence, + Timer, + Timerange, + Wait, +) +from .ops.misc import EndOnError, Errors +from .ops.op import Op +from .ops.select import ( + Changes, + DropWhile, + Filter, + Last, + Skip, + Take, + TakeUntil, + TakeWhile, + Unique, +) +from .ops.timing import Debounce, Delay, Sample, Throttle, Timeout +from .ops.transform import ( + Chainmap, + Chunk, + ChunkWith, + Concatmap, + Constant, + Copy, + Deepcopy, + Emap, + Enumerate, + Iterate, + Map, + Mergemap, + Pack, + Partial, + PartialRight, + Pluck, + Previous, + Star, + Switchmap, + Timestamp, +)