diff mbox series

framework/flow: Fix circular import

Message ID 20220131220937.38772-1-ohilyard@iol.unh.edu (mailing list archive)
State Accepted
Headers
Series framework/flow: Fix circular import |

Checks

Context Check Description
ci/Intel-dts-suite-test success Testing OK

Commit Message

Owen Hilyard Jan. 31, 2022, 10:09 p.m. UTC 
  From: Owen Hilyard <ohilyard@iol.unh.edu>

Some of the re-organization to DTS caused a previously ok circular
import to make the flow generator crash. Moving to local imports has
fixed this.

Signed-off-by: Owen Hilyard <ohilyard@iol.unh.edu>
---
 framework/flow/flow_items.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Tu, Lijuan Feb. 7, 2022, 8:53 a.m. UTC | #1 
> -----Original Message-----
> From: ohilyard@iol.unh.edu <ohilyard@iol.unh.edu>
> Sent: 2022年2月1日 6:10
> To: dts@dpdk.org
> Cc: Tu, Lijuan <lijuan.tu@intel.com>; Owen Hilyard <ohilyard@iol.unh.edu>
> Subject: [PATCH] framework/flow: Fix circular import
> 
> From: Owen Hilyard <ohilyard@iol.unh.edu>
> 
> Some of the re-organization to DTS caused a previously ok circular import to
> make the flow generator crash. Moving to local imports has fixed this.
> 
> Signed-off-by: Owen Hilyard <ohilyard@iol.unh.edu>

Applied
diff mbox series

Patch

diff --git a/framework/flow/flow_items.py b/framework/flow/flow_items.py
index 49684381..cce20b51 100644
--- a/framework/flow/flow_items.py
+++ b/framework/flow/flow_items.py
@@ -37,8 +37,6 @@  import itertools
 from functools import reduce
 from typing import Any, Dict, FrozenSet, Hashable, Iterable, Set, Tuple, Union
 
-import framework.flow.flow_action_items as flow_action_items
-import framework.flow.flow_pattern_items as flow_pattern_items
 
 from .enums import FlowActionType, FlowItemType
 from .exceptions import InvalidFlowItemException
@@ -90,15 +88,17 @@  class FlowItem(object):
         if type(self) != type(other):
             raise InvalidFlowItemException(self, other)
         elif other.type in self.valid_next_items:
-            # This import is in here so there is no circular import
+            # These imports are in here so there is no circular import
             from .flow import Flow
-            if isinstance(self, flow_pattern_items.PatternFlowItem):
+            from framework.flow.flow_pattern_items import PatternFlowItem
+            from framework.flow.flow_action_items import ActionFlowItem
+            if isinstance(self, PatternFlowItem):
                 return Flow(pattern_items=[self, other])
-            elif isinstance(self, flow_action_items.ActionFlowItem):
+            elif isinstance(self, ActionFlowItem):
                 return Flow(action_items=[self, other])
             else:
                 raise TypeError(
-                    f"{type(self):s} is not one of {flow_pattern_items.PatternFlowItem:s}, {flow_action_items.ActionFlowItem:s}.")
+                    f"{type(self):s} is not one of {PatternFlowItem:s}, {ActionFlowItem:s}.")
         else:
             raise InvalidFlowItemException(self, other)