modify atom parsing to retain the type property if it isn't "text/xml", should address #92

Author: Shakeel Mohamed

splunklib/client.py

@@ -237,7 +237,16 @@ def _parse_atom_entry(entry):
 
     # Filter some of the noise out of the content record
     content = record((k, v) for k, v in content.iteritems()
-        if k not in ['eai:acl', 'eai:attributes', 'type'])
+        if k not in ['eai:acl', 'eai:attributes'])
+
+    if type(content['type']) is type([]):
+        content['type'] = [t for t in content['type'] if t != 'text/xml']
+        if len(content['type']) == 0: # Unset type if it was only 'text/xml'
+            content.pop('type', None)
+        if len(content['type']) == 1: # Flatten 1 element list
+            content['type'] = content['type'][0]
+    else:
+        content.pop('type', None)
 
     return record({
         'title': title,

tests/test_service.py

@@ -103,6 +103,20 @@ def test_restart(self):
         self.service.restart(timeout=120)
         service.login() # Make sure we are awake
 
+    def test_read_outputs_with_type(self):
+        name = testlib.tmpname()
+        service = client.connect(**self.opts.kwargs)
+        service.post('data/outputs/tcp/syslog', name=name, type='tcp')
+        entity = client.Entity(service, 'data/outputs/tcp/syslog/' + name)
+        self.assertTrue('tcp', entity.content.type)
+
+        if service.restart_required:
+            self.restartSplunk()
+        service = client.connect(**self.opts.kwargs)
+        client.Entity(service, 'data/outputs/tcp/syslog/' + name).delete()
+        if service.restart_required:
+            self.restartSplunk()
+
     def test_splunk_version(self):
         service = client.connect(**self.opts.kwargs)
         v = service.splunk_version