Adding generic response for all 4xx

Author: michelle-miller

.travis.yml

@@ -15,6 +15,7 @@ install:
 - pip install pylint
 - pip install codecov
 - pip install git+git://github.com/watson-developer-cloud/python-sdk.git#egg=watson-developer-cloud
+- pip show six
 script:
 - sh pylint.sh
 - py.test test --cov=watson_developer_cloud

test/test_conversation_v1.py

@@ -15,6 +15,7 @@
 import json
 import responses
 import watson_developer_cloud
+from watson_developer_cloud import WatsonException
 
 platform_url = 'https://gateway.watsonplatform.net'
 service_path = '/conversation/api'
@@ -48,6 +49,24 @@ def test_create_counterexample():
     assert responses.calls[0].request.url.startswith(url)
     assert counterexample == response
 
+@responses.activate
+def test_rate_limit_exceeded():
+    endpoint = '/v1/workspaces/{0}/counterexamples'.format('boguswid')
+    url = '{0}{1}'.format(base_url, endpoint)
+    error_msg = {'Code': '429', 'Error: ': u'Rate Limit exceeded'}
+    responses.add(
+        responses.POST,
+        url,
+        body='Rate Limit exceeded',
+        status=429)
+    service = watson_developer_cloud.ConversationV1(
+        username='username', password='password', version='2017-02-03')
+    try:
+        counterexample = service.create_counterexample(
+            workspace_id='boguswid', text='I want financial advice today.')
+    except WatsonException as ex:
+        assert len(responses.calls) == 1
+        assert ex.message == error_msg
 
 @responses.activate
 def test_delete_counterexample():

watson_developer_cloud/dialog_v1.py

@@ -29,11 +29,11 @@ class DialogV1(WatsonDeveloperCloudService):
     def __init__(self, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'dialog', url, **kwargs)
         print(
-            'WARNING: The Dialog service was deprecated, existing instances '
-            'of the service will continue to function'
-            'until August 9, 2017. See '
-            'https://www.ibm.com/watson/developercloud/doc/conversation'
-            '/migration.shtml')
+            'WARNING: The Dialog service was deprecated. Existing instances '
+            'of the service stopped functioning on August 9, 2017. '
+            'Dialog was replaced by the Conversation service. See '
+            'https://console.bluemix.net/docs/services/conversation'
+            '/index.html#about')
 
     def get_dialogs(self):
         return self.request(method='GET', url='/v1/dialogs', accept_json=True)

watson_developer_cloud/watson_developer_cloud_service.py

@@ -190,9 +190,10 @@ def _get_error_message(response):
             if 'description' in error_json:
                 error_message += ', Description: ' + error_json['description']
             error_message += ', Code: ' + str(response.status_code)
+            return error_message
         except:
-            pass
-        return error_message
+            return {'Error: ': response.text or error_message, 'Code': str(response.status_code)}
+
 
     def _alchemy_html_request(self, method_name=None, url=None, html=None,
                               text=None, params=None, method='POST',