Merge branch 'master' into develop

Shakeel Mohamed · Shakeel Mohamed · commit f19b4a0df9d8 · 2015-10-01T16:20:57.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`.
 
@@ -33,7 +33,7 @@
 
 * GitHub issue 119: `None` returned in `_load_atom_entries`.
 
-* Various other bug fixes/improvements for Search Command Protocol V1.
+* Various other bug fixes/improvements for Search Command Protocol v1.
 
 * Various bug fixes/improvements to the full splunklib test suite.
 
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/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
 
