Merge 9255271 into 070b450

tests/test_nesting.py

@@ -12,6 +12,7 @@
 
 from transitions.extensions.nesting import NestedState
 from transitions.extensions import MachineFactory
+from transitions.core import Enum
 
 from unittest import skipIf
 from .test_core import TestTransitions as TestsCore
@@ -230,6 +231,23 @@ def test_add_nested_state(self):
         with self.assertRaises(ValueError):
             m.add_state(m.states['A'])
 
+    def test_add_nested_enums_as_nested_state(self):
+        from transitions.extensions.nesting_legacy import HierarchicalMachine
+        if self.machine_cls is HierarchicalMachine:
+            self.skipTest("Converting enums to nested states is not supported on the legacy HierarchicalMachine")
+
+        class Foo(Enum):
+            A = 0
+            B = 1
+
+        class Bar(Enum):
+            FOO = Foo
+            C = 2
+
+        m = self.stuff.machine_cls(states=Bar, initial='A')
+
+        self.assertEqual(sorted(m.states['FOO'].states.keys()), ['A', 'B'])
+
     def test_enter_exit_nested_state(self):
         State = self.state_cls
         mock = MagicMock()

transitions/extensions/nesting.py

@@ -7,7 +7,7 @@
 
 from six import string_types
 
-from ..core import State, Machine, Transition, Event, listify, MachineError, Enum, EventData
+from ..core import State, Machine, Transition, Event, listify, MachineError, Enum, EnumMeta, EventData
 
 _LOGGER = logging.getLogger(__name__)
 _LOGGER.addHandler(logging.NullHandler())
@@ -400,6 +400,9 @@ def add_ordered_transitions(self, states=None, trigger='next_state',
     def add_states(self, states, on_enter=None, on_exit=None, ignore_invalid_triggers=None, **kwargs):
         remap = kwargs.pop('remap', None)
         for state in listify(states):
+            if isinstance(state, Enum) and isinstance(state.value, EnumMeta):
+                state = {'name': state.name, 'children': state.value}
+
             if isinstance(state, string_types):
                 if remap is not None and state in remap:
                     return