updating classes to use standard attrs

Virtual-Josh · Virtual-Josh · commit 2b3f2bf63ae3 · 2019-11-12T15:42:30.000-08:00
diff --git a/libraries/botbuilder-core/botbuilder/core/Teams/teams_activity_handler.py b/libraries/botbuilder-core/botbuilder/core/Teams/teams_activity_handler.py
@@ -64,6 +64,7 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):
                     turn_context,
                 )
 
+            print(turn_context.activity)
             if channel_data is not None:
                 if channel_data.event_type == "channelCreated":
                     return await self.on_teams_channel_created_activity(
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/channel_info.py b/libraries/botbuilder-schema/botbuilder/schema/teams/channel_info.py
@@ -7,23 +7,8 @@
 # regenerated.
 
 
-class ChannelInfo:
+class ChannelInfo(object):
     def __init__(self, id="", name=""):
-        self._id = id
-        self._name = name
-
-    @property
-    def id(self):
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        self._id = id
-
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = name
+        self.id = id
+        self.name = name
+   
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/notification_info.py b/libraries/botbuilder-schema/botbuilder/schema/teams/notification_info.py
@@ -9,12 +9,4 @@
 
 class NotificationInfo:
     def __init__(self, alert: bool = False):
-        self._alert = alert
-
-    @property
-    def alert():
-        return self._alert
-
-    @alert.setter
-    def alert(alert):
-        self._alert = alert
+        self.alert = alert
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/team_info.py b/libraries/botbuilder-schema/botbuilder/schema/teams/team_info.py
@@ -9,28 +9,6 @@
 
 class TeamInfo:
     def __init__(self, id="", name="", aadGroupId=""):
-        self._id = id
-        self._name = name
-        self._aad_group_id = aadGroupId
-
-    def get_id(self):
-        return self._id
-
-    def set_id(self, id):
-        self._id = id
-
-    def get_name(self):
-        return self._name
-
-    def set_name(self, name):
-        self._name = name
-
-    def get_aad_group_id(self):
-        return self._aad_group_id
-
-    def set_aad_group_id(self, aad_group_id):
-        self._aad_group_id = aad_group_id
-
-    id = property(get_id, set_id)
-    name = property(get_name, set_name)
-    aad_group_id = property(get_aad_group_id, set_aad_group_id)
+        self.id = id
+        self.name = name
+        self.aad_group_id = aadGroupId
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/teams_channel_account.py b/libraries/botbuilder-schema/botbuilder/schema/teams/teams_channel_account.py
@@ -24,50 +24,7 @@ def __init__(
         super().__init__(
             **{"id": id, "name": name, "aad_object_id": aad_object_id, "role": role}
         )
-        self._given_name = given_name
-        self._surname = surname
-        self._email = email
-        self._user_principal_name = userPrincipalName
-
-    def get_id(self):
-        return self._id
-
-    def set_id(self, id):
-        self._id = id
-
-    def get_name(self):
-        return self._name
-
-    def set_name(self, name):
-        self._name = name
-
-    def get_given_name(self):
-        return self._given_name
-
-    def set_given_name(self, given_name):
-        self._given_name = given_name
-
-    def get_surname(self):
-        return self._surname
-
-    def set_surname(self, surname):
-        self._surname = surname
-
-    def get_email(self):
-        return self._email
-
-    def set_email(self, email):
-        self._email = email
-
-    def get_user_principal_name(self):
-        return self._user_principal_name
-
-    def set_user_principal_name(self, user_principal_name):
-        self._user_principal_name = user_principal_name
-
-    id = property(get_id, set_id)
-    name = property(get_name, set_name)
-    given_name = property(get_given_name, set_given_name)
-    surname = property(get_surname, set_surname)
-    email = property(get_email, set_email)
-    user_principal_name = property(get_user_principal_name, set_user_principal_name)
+        self.given_name = given_name
+        self.surname = surname
+        self.email = email
+        self.user_principal_name = userPrincipalName

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ async def on_conversation_update_activity(self, turn_context: TurnContext):`
`64`	`64`	`turn_context,`
`65`	`65`	`)`
`66`	`66`
	`67`	`+ print(turn_context.activity)`
`67`	`68`	`if channel_data is not None:`
`68`	`69`	`if channel_data.event_type == "channelCreated":`
`69`	`70`	`return await self.on_teams_channel_created_activity(`