From 68a0b96d19a39834fc804f2663805783a8944030 Mon Sep 17 00:00:00 2001 From: Eric Dahlvang Date: Tue, 17 Dec 2019 11:32:23 -0800 Subject: [PATCH 1/2] change comments --- .../botbuilder/core/teams/teams_activity_handler.py | 1 - .../botbuilder-core/botbuilder/core/teams/teams_helper.py | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py index 841a41f0e..04725db13 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_handler.py @@ -412,7 +412,6 @@ async def on_teams_members_removed_dispatch( # pylint: disable=unused-argument ): teams_members_removed = [] for member in members_removed: - # TODO: fix this new_account_json = member.serialize() if "additional_properties" in new_account_json: del new_account_json["additional_properties"] diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py index 4fd3c8ed4..4df70c6e2 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py @@ -10,6 +10,8 @@ import botbuilder.schema as schema import botbuilder.schema.teams as teams_schema +# Optimization: The dependencies dictionary could be cached here, +# and shared between the two methods. def deserializer_helper(msrest_cls: Type[Model], dict_to_deserialize: dict) -> Model: dependencies = [ @@ -26,10 +28,6 @@ def deserializer_helper(msrest_cls: Type[Model], dict_to_deserialize: dict) -> M deserializer = Deserializer(dependencies_dict) return deserializer(msrest_cls.__name__, dict_to_deserialize) - -# TODO consolidate these two methods - - def serializer_helper(object_to_serialize: Model) -> dict: if object_to_serialize is None: return None From 702e602bca6c00859af9804dc7800d1fc4008917 Mon Sep 17 00:00:00 2001 From: Eric Dahlvang Date: Tue, 17 Dec 2019 11:40:00 -0800 Subject: [PATCH 2/2] black fix --- .../botbuilder-core/botbuilder/core/teams/teams_helper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py index 4df70c6e2..f9d294c39 100644 --- a/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py +++ b/libraries/botbuilder-core/botbuilder/core/teams/teams_helper.py @@ -10,9 +10,10 @@ import botbuilder.schema as schema import botbuilder.schema.teams as teams_schema -# Optimization: The dependencies dictionary could be cached here, +# Optimization: The dependencies dictionary could be cached here, # and shared between the two methods. + def deserializer_helper(msrest_cls: Type[Model], dict_to_deserialize: dict) -> Model: dependencies = [ schema_cls @@ -28,6 +29,7 @@ def deserializer_helper(msrest_cls: Type[Model], dict_to_deserialize: dict) -> M deserializer = Deserializer(dependencies_dict) return deserializer(msrest_cls.__name__, dict_to_deserialize) + def serializer_helper(object_to_serialize: Model) -> dict: if object_to_serialize is None: return None