merging

Author: jsstylos

watson_developer_cloud/visual_recognition_v3.py

@@ -22,7 +22,6 @@
 
 
 class VisualRecognitionV3(WatsonDeveloperCloudService):
-
     """Client for the Visual Recognition service"""
 
     default_url = 'https://gateway-a.watsonplatform.net/visual-recognition/api'

watson_developer_cloud/watson_developer_cloud_service.py

@@ -99,6 +99,8 @@ def __init__(self, vcap_services_name, url, username=None, password=None, use_vc
                     self.api_key = self.vcap_service_credentials['api_key']
                 if 'apikey' in self.vcap_service_credentials:
                     self.api_key = self.vcap_service_credentials['apikey']
+                if 'api_key' in self.vcap_service_credentials:
+                    self.api_key = self.vcap_service_credentials['api_key']
 
         if (self.username is None or self.password is None) and self.api_key is None:
             raise WatsonException('You must specific your username and password service credentials ' +