adding support for non-json document conversion output

Author: jsstylos

examples/document_conversion_v1.py

@@ -8,7 +8,12 @@
                                            password='YOUR SERVICE PASSWORD',
                                            version='2016-02-09')
 
+# Example of retrieving html or plain text
 with open(join(dirname(__file__), '../resources/example.html'), 'r') as document:
-    config = {'conversion_target': DocumentConversionV1.ANSWER_UNITS}
-    print(json.dumps(document_conversion.convert_document(document=document, config=config, media_type='text/html'),
-                     indent=2))
+    config = {'conversion_target': DocumentConversionV1.NORMALIZED_HTML}
+    print(document_conversion.convert_document(document=document, config=config, media_type='text/html')).text
+
+# Example with JSON
+with open(join(dirname(__file__), '../resources/example.html'), 'r') as document:
+    config['conversion_target'] = DocumentConversionV1.ANSWER_UNITS
+    print(json.dumps(document_conversion.convert_document(document=document, config=config), indent=2))

watson_developer_cloud/document_conversion_v1.py

@@ -34,4 +34,6 @@ def convert_document(self, document, config, media_type=None):
         file_tuple = (filename, document, media_type) if media_type else (filename, document)
         files = [('file', file_tuple),
                  ('config', ('config.json', json.dumps(config), 'application/json'))]
-        return self.request(method='POST', url='/v1/convert_document', files=files, params=params, accept_json=True)
+        accept_json = config['conversion_target'] == DocumentConversionV1.ANSWER_UNITS
+        return self.request(method='POST', url='/v1/convert_document', files=files, params=params,
+                            accept_json=accept_json)