Merge pull request #63 from rjelierse/master

Revert "Merge pull request #41 from mariuspot/master"

Author: marcel corso gonzalez

README.md

@@ -78,14 +78,6 @@ To run examples with arguments, try:
 $ python ./examples/voice_create_webhook.py --accessKey accessKeyWhichNotExist --url https://example.com --title HELLO_WEBHOOK --token HELLO_TOKEN
 ```
 
-Conversations WhatsApp Sandbox
--------------
-To use the whatsapp sandbox you need to add `messagebird.Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX` to the list of features you want enabled. Don't forget to replace `YOUR_ACCESS_KEY` with your actual access key.
-
-```python
-  client = messagebird.Client('1ekjMs368KTRlP0z6zfG9P70z', features=[messagebird.Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX])
-```
-
 Documentation
 -------------
 Complete documentation, instructions, and examples are available at:

messagebird/__init__.py

@@ -1,2 +1,2 @@
-from messagebird.client import Client, ErrorException, Feature
+from messagebird.client import Client, ErrorException
 from messagebird.signed_request import SignedRequest

messagebird/client.py

@@ -1,7 +1,6 @@
 import sys
 import json
 import io
-import enum
 
 from messagebird.balance import Balance
 from messagebird.call import Call
@@ -32,8 +31,6 @@
 REST_TYPE = 'rest'
 
 CONVERSATION_API_ROOT = 'https://conversations.messagebird.com/v1/'
-CONVERSATION_API_WHATSAPP_SANDBOX_ROOT = 'https://whatsapp-sandbox.messagebird.com/v1/'
-
 CONVERSATION_PATH = 'conversations'
 CONVERSATION_MESSAGES_PATH = 'messages'
 CONVERSATION_WEB_HOOKS_PATH = 'webhooks'
@@ -65,24 +62,17 @@ def __init__(self, errorMessage):
         super(SignleErrorException, self).__init__(errorMessage)
 
 
-class Feature(enum.Enum):
-    ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX = 1
-
-
 class Client(object):
-
-    def __init__(self, access_key, http_client=None, features=[]):
+    def __init__(self, access_key, http_client=None):
         self.access_key = access_key
         self.http_client = http_client
 
-        self.conversation_api_root = CONVERSATION_API_WHATSAPP_SANDBOX_ROOT if Feature.ENABLE_CONVERSATIONS_API_WHATSAPP_SANDBOX in features else CONVERSATION_API_ROOT
-
     def _get_http_client(self, type=REST_TYPE):
         if self.http_client:
             return self.http_client
 
         if type == CONVERSATION_TYPE:
-            return HttpClient(self.conversation_api_root, self.access_key, USER_AGENT)
+            return HttpClient(CONVERSATION_API_ROOT, self.access_key, USER_AGENT)
 
         if type == VOICE_TYPE:
             return HttpClient(VOICE_API_ROOT, self.access_key, USER_AGENT)