release 0.6.5

also: reworked `_get_graph`

Author: aleneum

.gitignore

@@ -15,3 +15,4 @@ examples/state.png
 MANIFEST
 *.bak
 pylint.log
+test.py

Changelog.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## 0.6.5 ()
+## 0.6.5 (April, 2018)
 
-- Feature #287: Embedding `HierarchicalMachine` will now reuse the machine's `initial` state. Passing `initial: False` overrides this(thanks @mrjogo).
+Release 0.6.5 is a minor release and contains a new feature and a bugfix:
+
+- Feature #287: Embedding `HierarchicalMachine` will now reuse the machine's `initial` state. Passing `initial: False` overrides this (thanks @mrjogo).
 - Bug #292: Models using `GraphMashine` were not picklable in the past due to `graph` property. Graphs for each model are now stored in `GraphMachine.model_graphs` (thanks @ansumanm)
 
 ## 0.6.4 (January, 2018)

README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/pytransitions/transitions/badge.svg?branch=master&service=github)](https://coveralls.io/github/pytransitions/transitions?branch=master)
 [![Pylint](https://img.shields.io/badge/pylint-9.71%2F10-green.svg)](https://github.com/pytransitions/transitions)
 [![PyPi](https://img.shields.io/pypi/v/transitions.svg)](https://pypi.org/project/transitions)
-[![GitHub commits](https://img.shields.io/github/commits-since/pytransitions/transitions/0.6.4.svg)](https://github.com/pytransitions/transitions/compare/0.6.4...master)
+[![GitHub commits](https://img.shields.io/github/commits-since/pytransitions/transitions/0.6.5.svg)](https://github.com/pytransitions/transitions/compare/0.6.5...master)
 [![License](https://img.shields.io/github/license/pytransitions/transitions.svg)](LICENSE)
 <!--[![Name](Image)](Link)-->
 

test.py

@@ -307,6 +307,7 @@ class GraphMachine(Machine):
     """
 
     _pickle_blacklist = ['model_graphs']
+    graph_cls = Graph
     transition_cls = TransitionGraphSupport
 
     # model_graphs cannot be pickled. Omit them.
@@ -359,14 +360,13 @@ def __init__(self, *args, **kwargs):
             setattr(self, 'get_graph', self.get_combined_graph)
 
     def _get_graph(self, model, title=None, force_new=False, show_roi=False):
-        if title is None:
-            title = self.title
-        if model not in self.model_graphs or force_new:
-            self.model_graphs[model] = NestedGraph(self).get_graph(title) if isinstance(self, HierarchicalMachine) \
-                else Graph(self).get_graph(title)
+        if force_new:
+            self.model_graphs[model] = self.graph_cls(self).get_graph(title if title is not None else self.title)
             self.set_node_state(self.model_graphs[model], model.state, state='active')
-
-        return self.model_graphs[model] if not show_roi else self._graph_roi(model)
+        try:
+            return self.model_graphs[model] if not show_roi else self._graph_roi(model)
+        except KeyError:
+            return self._get_graph(model, title, force_new=True, show_roi=show_roi)
 
     def get_combined_graph(self, title=None, force_new=False, show_roi=False):
         """ This method is currently equivalent to 'get_graph' of the first machine's model.

transitions/extensions/diagrams.py

@@ -11,7 +11,7 @@
 
 from .nesting import HierarchicalMachine, NestedTransition, NestedEvent
 from .locking import LockedMachine, LockedEvent
-from .diagrams import GraphMachine, TransitionGraphSupport
+from .diagrams import GraphMachine, TransitionGraphSupport, NestedGraph
 
 
 class MachineFactory(object):
@@ -55,6 +55,7 @@ class HierarchicalGraphMachine(GraphMachine, HierarchicalMachine):
     """
 
     transition_cls = NestedGraphTransition
+    graph_cls = NestedGraph
 
 
 class LockedHierarchicalMachine(LockedMachine, HierarchicalMachine):
@@ -79,6 +80,7 @@ class LockedHierarchicalGraphMachine(GraphMachine, LockedMachine, HierarchicalMa
 
     transition_cls = NestedGraphTransition
     event_cls = LockedNestedEvent
+    graph_cls = NestedGraph
 
 
 # 3d tuple (graph, nested, locked)