fix card_styler, add ActivityAdapter reference, update Echo.Connector.Bot.Adapter

stevengum · stevengum · commit 2f570cb6d315 · 2018-02-22T15:02:13.000-08:00
diff --git a/libraries/botbuilder/microsoft/botbuilder/__init__.py b/libraries/botbuilder/microsoft/botbuilder/__init__.py
@@ -6,21 +6,13 @@
 # --------------------------------------------------------------------------
 
 
-from .activity import ACTIVITY_TYPES, ATTACHMENT_LAYOUTS, END_OF_CONVERSATION_CODES, TEXT_FORMATS
 from .activity_adapter import ActivityAdapter
-from .card_styler import CardStyler, ContentTypes
 from .assertions import BotAssert
+from .bot_framework_adapter import BotFrameworkAdapter
+from .card_styler import CardStyler, ContentTypes
 
-__all__ = ['activity',
-           'activity_adapter',
-           'assertions',
-           'card_styler',
-           'ACTIVITY_TYPES',
-           'ATTACHMENT_LAYOUTS',
-           'END_OF_CONVERSATION_CODES',
-           'TEXT_FORMATS',
-           'ActivityAdapter',
+__all__ = ['ActivityAdapter',
+           'BotAssert',
+           'BotFrameworkAdapter',
            'CardStyler',
-           'ContentTypes',
-           'BotAssert']
-
+           'ContentTypes',]
diff --git a/libraries/botbuilder/microsoft/botbuilder/bot_framework_adapter.py b/libraries/botbuilder/microsoft/botbuilder/bot_framework_adapter.py
@@ -8,6 +8,7 @@
 from microsoft.botframework.connector.auth import (MicrosoftAppCredentials,
                                                    JwtTokenValidation, SimpleCredentialProvider)
 
+from .activity_adapter import ActivityAdapter
 
 class BotFrameworkAdapter(ActivityAdapter):
     
diff --git a/libraries/botbuilder/microsoft/botbuilder/card_styler.py b/libraries/botbuilder/microsoft/botbuilder/card_styler.py
@@ -2,11 +2,11 @@
 # Licensed under the MIT License.
 
 
-import enum
+from enum import Enum
 from copy import deepcopy
 
 
-class ContentTypes(enum):
+class ContentTypes(Enum):
     """List of content types for each card style."""
     adaptive_card = 'application/vnd.microsoft.card.adaptive'
     animation_card = 'application/vnd.microsoft.card.animation'
diff --git a/samples/Echo.Connector.Bot.Adapter/main.py b/samples/Echo.Connector.Bot.Adapter/main.py
@@ -5,7 +5,7 @@
 import json
 import asyncio
 from microsoft.botbuilder.schema import (Activity, ActivityTypes, ChannelAccount)
-from bot_framework_adapter import BotFrameworkAdapter
+from microsoft.botbuilder import BotFrameworkAdapter
 
 APP_ID = ''
 APP_PASSWORD = ''
