Merge branch 'master' into fix-docs

Author: ehdsouza

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.5
 commit = True
 
 [bumpversion:file:watson_developer_cloud/version.py]

.travis.yml

@@ -34,6 +34,7 @@ deploy:
     script: docs/publish.sh
     skip_cleanup: true
     on:
+      python: '3.5'
       tags: true
   - provider: script
     script: npx semantic-release
@@ -48,4 +49,5 @@ deploy:
     repository: https://upload.pypi.org/legacy
     skip_cleanup: true
     on:
+      python: '3.5'
       tags: true

examples/assistant_v2.py

@@ -4,7 +4,7 @@
 
 # If service instance provides API key authentication
 # assistant = AssistantV2(
-#     version='2017-04-21',
+#     version='2018-09-20',
 #     ## url is optional, and defaults to the URL below. Use the correct URL for your region.
 #     url='https://gateway.watsonplatform.net/assistant/api',
 #     iam_apikey='iam_apikey')
@@ -14,7 +14,7 @@
     password='YOUR SERVICE PASSWORD',
     ## url is optional, and defaults to the URL below. Use the correct URL for your region.
     url='https://gateway.watsonplatform.net/assistant/api',
-    version='2017-04-21')
+    version='2018-09-20')
 
 #########################
 # Sessions

setup.py

@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = '2.2.0'
+__version__ = '2.2.5'
 
 if sys.argv[-1] == 'publish':
     # test server

test/unit/test_authorization_v1.py

@@ -0,0 +1,17 @@
+# coding: utf-8
+import responses
+import watson_developer_cloud
+
+
+@responses.activate
+def test_request_token():
+    url = 'https://stream.watsonplatform.net/authorization/api/v1/token?url=https://stream.watsonplatform.net/speech-to-text/api'
+    responses.add(responses.GET,
+                  url=url,
+                  body=b'mocked token',
+                  status=200)
+    authorization = watson_developer_cloud.AuthorizationV1(username='xxx',
+                                                           password='yyy')
+    authorization.get_token(url=watson_developer_cloud.SpeechToTextV1.default_url)
+    assert responses.calls[0].request.url == url
+    assert responses.calls[0].response.content.decode('utf-8') == 'mocked token'

watson_developer_cloud/authorization_v1.py

@@ -52,4 +52,4 @@ def get_token(self, url):
         self.url = urlparse.urlunsplit(parsed_url)
 
         response = self.request(method='GET', url='/v1/token?url=' + url)
-        return response.text
+        return response.result.text

watson_developer_cloud/speech_to_text_v1_adapter.py

@@ -199,7 +199,14 @@ def recognize_using_websocket(self,
         }
         options = _remove_null_values(options)
 
-        RecognizeListener(audio, options, recognize_callback, url, headers, http_proxy_host, http_proxy_port)
+        RecognizeListener(audio,
+                          options,
+                          recognize_callback,
+                          url,
+                          headers,
+                          http_proxy_host,
+                          http_proxy_port,
+                          self.verify)
 
     def add_corpus(self,
                    customization_id,

watson_developer_cloud/version.py

@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = '2.2.5'

watson_developer_cloud/websocket/recognize_listener.py

@@ -17,6 +17,7 @@
 import websocket
 import json
 import time
+import ssl
 try:
     import thread
 except ImportError:
@@ -31,7 +32,15 @@
 STOP = "stop"
 
 class RecognizeListener(object):
-    def __init__(self, audio_source, options, callback, url, headers, http_proxy_host=None, http_proxy_port=None):
+    def __init__(self,
+                 audio_source,
+                 options,
+                 callback,
+                 url,
+                 headers,
+                 http_proxy_host=None,
+                 http_proxy_port=None,
+                 verify=None):
         self.audio_source = audio_source
         self.options = options
         self.callback = callback
@@ -40,6 +49,7 @@ def __init__(self, audio_source, options, callback, url, headers, http_proxy_hos
         self.http_proxy_host = http_proxy_host
         self.http_proxy_port = http_proxy_port
         self.isListening = False
+        self.verify = verify
 
         # websocket.enableTrace(True)
 
@@ -51,7 +61,10 @@ def __init__(self, audio_source, options, callback, url, headers, http_proxy_hos
             on_error=self.on_error,
             on_close=self.on_close,
         )
-        self.ws_client.run_forever(http_proxy_host=self.http_proxy_host, http_proxy_port=self.http_proxy_port)
+
+        self.ws_client.run_forever(http_proxy_host=self.http_proxy_host,
+                                   http_proxy_port=self.http_proxy_port,
+                                   sslopt={"cert_reqs": ssl.CERT_NONE} if self.verify is not None else None)
 
     @classmethod
     def build_start_message(cls, options):