Natural Language Understanding minor clean up

Author: jsstylos

test/test_examples.py

@@ -9,7 +9,9 @@
 from glob import glob
 
 # tests to exclude
-excludes = ['authorization_v1.py', 'alchemy_data_news_v1.py', 'alchemy_language_v1.py', 'discovery_v1.ipynb', '__init__.py']
+excludes = ['authorization_v1.py', 'alchemy_data_news_v1.py',
+            'alchemy_language_v1.py', 'discovery_v1.ipynb', '__init__.py'
+            'natural_language_understanding_v1.py']
 
 # examples path. /examples
 examples_path = join(dirname(__file__), '../', 'examples', '*.py')

watson_developer_cloud/natural_language_understanding_v1.py

@@ -55,26 +55,22 @@ def analyze(self, features, text=None, url=None, html=None,
         :param language: what language to use
         :return: dict of analyzed text
         """
-        body = {'clean': clean, 'fallback_to_raw': fallback_to_raw,
-                'return_analyzed_text': return_analyzed_text}
-        if xpath:
-            body['xpath'] = xpath
-
-        if language:
-            body['language'] = language
+        body = {'clean': clean,
+                'fallback_to_raw': fallback_to_raw,
+                'return_analyzed_text': return_analyzed_text,
+                'xpath': xpath,
+                'language': language,
+                'text': text,
+                'url': url,
+                'html': html
+                }
 
         feature_dict = {}
         for feature in features:
             feature_dict[feature.name()] = feature.toDict()
         body['features'] = feature_dict
 
-        if text:
-            body['text'] = text
-        elif url:
-            body['url'] = url
-        elif html:
-            body['html'] = html
-        else:
+        if not (text or url or body):
             msg = "html, text, or url must have content"
             raise ValueError(msg)
 
@@ -84,5 +80,5 @@ def analyze(self, features, text=None, url=None, html=None,
         return self.request(method='POST', url='/v1/analyze',
                             params={"version": self.version},
                             headers={'content-type': 'application/json'},
-                            data=json.dumps(body),
+                            json=body,
                             accept_json=True)