Merge branch 'develop' of https://github.com/splunk/splunk-sdk-python into develop

David Noble · David Noble · commit 6692ef7117fd · 2015-10-01T16:34:50.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,5 @@ splunk_sdk.egg-info/
 dist/
 examples/searchcommands_app/package/default/commands.conf
 examples/searchcommands_app/package/bin/packages
+tests/searchcommands/apps/app_with_logging_configuration/*.log
+*.observed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### New features and APIs
 
-* Added support for the new experimental Search Command Protocol V2, for Splunk 6.3+.
+* Added support for the new experimental Search Command Protocol v2, for Splunk 6.3+.
 
   Opt-in by setting `chunked = true` in commands.conf. See `examples/searchcommands_app/package/default/commands-scpv2.conf`.
 
@@ -27,9 +27,13 @@
 
 ### Bug fixes
 
-* GitHub issue 88: `splunklib.searchcommands.splunk_csv.dict_reader` raises `KeyError` when `supports_multivalues = True`.
+* GitHub issue 88: `splunklib.modularinput`, `<done/>` written even when `done=False`.
 
-* Various other bug fixes/improvements for Search Command Protocol V1.
+* GitHub issue 115: `splunklib.searchcommands.splunk_csv.dict_reader` raises `KeyError` when `supports_multivalues = True`.
+
+* GitHub issue 119: `None` returned in `_load_atom_entries`.
+
+* Various other bug fixes/improvements for Search Command Protocol v1.
 
 * Various bug fixes/improvements to the full splunklib test suite.
 
diff --git a/setup.py b/setup.py
@@ -37,6 +37,7 @@ def run_test_suite():
     unittest.TextTestRunner().run(suite)
     os.chdir(original_cwd)
 
+
 def run_test_suite_with_junit_output():
     try:
         import unittest2 as unittest
@@ -49,6 +50,7 @@ def run_test_suite_with_junit_output():
     xmlrunner.XMLTestRunner(output='../test-reports').run(suite)
     os.chdir(original_cwd)
 
+
 class CoverageCommand(Command):
     """setup.py command to run code coverage of the test suite."""
     description = "Create an HTML coverage report from running the full test suite."
@@ -87,6 +89,7 @@ def finalize_options(self):
     def run(self):
         run_test_suite()
 
+
 class JunitXmlTestCommand(Command):
     """setup.py command to run the whole test suite."""
     description = "Run test full test suite with JUnit-formatted output."
@@ -170,7 +173,7 @@ def run(self):
 
         setup_py = os.path.join('examples', 'searchcommands_app', 'setup.py')
 
-        check_call((setup_py, 'build', '--force'), stderr=STDOUT, stdout=sys.stdout)
+        check_call(('python', setup_py, 'build', '--force'), stderr=STDOUT, stdout=sys.stdout)
         tarball = 'searchcommands_app-{0}-private.tar.gz'.format(self.distribution.metadata.version)
         source = os.path.join('examples', 'searchcommands_app', 'build', tarball)
         target = os.path.join('build', tarball)
diff --git a/splunklib/binding.py b/splunklib/binding.py
@@ -1324,7 +1324,7 @@ def request(url, message, **kwargs):
         head = {
             "Content-Length": str(len(body)),
             "Host": host,
-            "User-Agent": "splunk-sdk-python/1.4",
+            "User-Agent": "splunk-sdk-python/1.5.0",
             "Accept": "*/*",
         } # defaults
         for key, value in message["headers"]:
diff --git a/splunklib/client.py b/splunklib/client.py
@@ -201,7 +201,7 @@ def _load_atom_entries(response):
     r = _load_atom(response)
     if 'feed' in r:
         # Need this to handle a random case in the REST API
-        if r.feed.get('totalResults') == 0:
+        if r.feed.get('totalResults') in [0, '0']:
             return []
         entries = r.feed.get('entry', None)
         if entries is None: return None
diff --git a/splunklib/modularinput/script.py b/splunklib/modularinput/script.py
@@ -103,7 +103,7 @@ def run_script(self, args, event_writer, input_stream):
                 event_writer._err.write(err_string)
 
         except Exception as e:
-            err_string = EventWriter.ERROR + e.message
+            err_string = EventWriter.ERROR + str(e.message)
             event_writer._err.write(err_string)
             return 1
 
