pylint fixes

Author: jsstylos

watson_developer_cloud/alchemy_language_v1.py

@@ -51,8 +51,8 @@ def keywords(self, html=None, text=None, url=None,
         if not max_items:
             max_items = max_keywords
         params = {
-            'keywordExtractMode': 'strict' if strict_extract_mode else
-            'normal',
+            'keywordExtractMode':
+                'strict' if strict_extract_mode else 'normal',
             'sentiment': sentiment,
             'emotion': emotion,
             'showSourceText': show_source_text,

watson_developer_cloud/retrieve_and_rank_v1.py

@@ -81,9 +81,8 @@ def get_config(self, solr_cluster_id, config_name):
     def list_collections(self, solr_cluster_id):
         params = {'action': 'LIST', 'wt': 'json'}
         return self.request(method='GET',
-                            url='/v1/solr_clusters/{'
-                                '0}/solr/admin/collections'.format(
-                                solr_cluster_id),
+                            url='/v1/solr_clusters/{0}/solr/admin/collections'
+                            .format(solr_cluster_id),
                             params=params, accept_json=True)
 
     def create_collection(self, solr_cluster_id, collection_name, config_name):

watson_developer_cloud/visual_recognition_v3.py

@@ -124,8 +124,8 @@ def _image_call(self, url, images_file=None, images_url=None, params=None):
                                 accept_json=True)
         else:
             filename = images_file.name
-            mime_type = mimetypes.guess_type(filename)[
-                            0] or 'application/octet-stream'
+            mime_type = mimetypes.guess_type(
+                filename)[0] or 'application/octet-stream'
             return self.request(method='POST', url=url,
                                 files={'images_file': (
                                     filename, images_file, mime_type)},
@@ -241,15 +241,15 @@ def add_image(self, collection_id, image_file, metadata=None):
         """
         metadata = metadata or {}
         filename = image_file.name
-        mime_type = mimetypes.guess_type(filename)[
-                        0] or 'application/octet-stream'
+        mime_type = mimetypes.guess_type(
+            filename)[0] or 'application/octet-stream'
         return self.request(method='POST',
                             url='/v3/collections/{0}/images'.format(
                                 collection_id),
                             params={'version': self.version},
                             files={
                                 'image_file': (
-                                filename, image_file, mime_type),
+                                    filename, image_file, mime_type),
                                 'metadata': (
                                     'metadata.json', json.dumps(metadata),
                                     'application/json')},
@@ -360,8 +360,8 @@ def find_similar(self, collection_id, image_file, limit=10):
            "images_processed": 1
         }
         """
-        mime_type = mimetypes.guess_type(image_file.name)[
-                        0] or 'application/octet-stream'
+        mime_type = mimetypes.guess_type(
+            image_file.name)[0] or 'application/octet-stream'
         return self.request(method='POST',
                             url='/v3/collections/{0}/find_similar'.format(
                                 collection_id),

watson_developer_cloud/watson_developer_cloud_service.py

@@ -125,9 +125,8 @@ def __init__(self, vcap_services_name, url, username=None, password=None,
                 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:
+        if (self.username is None or self.password is None)\
+                and self.api_key is None:
             raise WatsonException(
                 'You must specify your username and password service '
                 'credentials ' +
@@ -301,8 +300,8 @@ def request(self, method, url, accept_json=False, headers=None,
         if 200 <= response.status_code <= 299:
             if accept_json:
                 response_json = response.json()
-                if 'status' in response_json and response_json[
-                    'status'] == 'ERROR':
+                if 'status' in response_json and response_json['status'] \
+                        == 'ERROR':
                     response.status_code = 400
                     error_message = 'Unknown error'
                     if 'statusInfo' in response_json: