From eafff44a12e22b41c6644ca2a9c0d41f744d419f Mon Sep 17 00:00:00 2001 From: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Date: Tue, 26 Nov 2019 11:02:18 -0800 Subject: [PATCH 1/3] Fix compute_hash --- libraries/botbuilder-core/botbuilder/core/bot_state.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/bot_state.py b/libraries/botbuilder-core/botbuilder/core/bot_state.py index dc835a9bd..a4270c159 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_state.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_state.py @@ -24,8 +24,7 @@ def is_changed(self) -> bool: return self.hash != self.compute_hash(self.state) def compute_hash(self, obj: object) -> str: - # TODO: Should this be compatible with C# JsonConvert.SerializeObject ? - return str(obj) + return str(Pickler().flatten(obj)) class BotState(PropertyManager): From 5392e52f11241634f74841e7932cb9ae8e410072 Mon Sep 17 00:00:00 2001 From: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Date: Tue, 26 Nov 2019 11:10:54 -0800 Subject: [PATCH 2/3] added import --- libraries/botbuilder-core/botbuilder/core/bot_state.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/botbuilder-core/botbuilder/core/bot_state.py b/libraries/botbuilder-core/botbuilder/core/bot_state.py index a4270c159..4c9a178b4 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_state.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_state.py @@ -8,6 +8,7 @@ from .turn_context import TurnContext from .storage import Storage from .property_manager import PropertyManager +from jsonpickle.pickler import Pickler class CachedBotState: From f757a57744e877afee4d422be328b04a47c641e5 Mon Sep 17 00:00:00 2001 From: Michael Richardson <40401643+mdrichardson@users.noreply.github.com> Date: Tue, 26 Nov 2019 11:17:57 -0800 Subject: [PATCH 3/3] pylint fix --- libraries/botbuilder-core/botbuilder/core/bot_state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/botbuilder-core/botbuilder/core/bot_state.py b/libraries/botbuilder-core/botbuilder/core/bot_state.py index 4c9a178b4..4e615dda0 100644 --- a/libraries/botbuilder-core/botbuilder/core/bot_state.py +++ b/libraries/botbuilder-core/botbuilder/core/bot_state.py @@ -4,11 +4,11 @@ from abc import abstractmethod from copy import deepcopy from typing import Callable, Dict, Union +from jsonpickle.pickler import Pickler from botbuilder.core.state_property_accessor import StatePropertyAccessor from .turn_context import TurnContext from .storage import Storage from .property_manager import PropertyManager -from jsonpickle.pickler import Pickler class CachedBotState: