Unwrapped all HTTPErrors except those being turned into KeyErrors in dict-like contexts.

Removed wrapper exceptions that were no longer used.
Fixed the unit tests to expect HTTPErrors.

Author: Frederick Ross

splunklib/client.py

@@ -108,16 +108,6 @@
 
 MATCH_ENTRY_CONTENT = "%s/%s/*" % (XNAME_ENTRY, XNAME_CONTENT)
 
-class NoSuchUserException(Exception):
-    """Thrown when a request is made to Splunk using a namespace that contains
-    a nonexistant user."""
-    pass
-
-class NoSuchApplicationException(Exception):
-    """Thrown when a request is made to Splunk using a namespace that contains
-    a nonexistant application."""
-    pass
-
 class IllegalOperationException(Exception):
     """Thrown when an operation is not possible on the Splunk instance that a
     :class:`Service` object is connected to."""
@@ -142,11 +132,6 @@ class InvalidNameException(Exception):
     in Splunk entity names."""
     pass
 
-class OperationFailedException(Exception):
-    """Thrown when the requested operation resulted in an error in Splunk (and a
-    400 HTTP return status)."""
-    pass
-
 class NoSuchCapability(Exception):
     """Thrown when the capability that has been referred to doesn't exist."""
     pass
@@ -2403,13 +2388,7 @@ def oneshot(self, path, **kwargs):
             available parameters, see `Input parameters <http://dev.splunk.com/view/SP-CAAAEE6#inputparams>`_ on Splunk Developer Portal.
         :type kwargs: ``dict``
         """
-        try:
-            self.post('oneshot', name=path, **kwargs)
-        except HTTPError as he:
-            if he.status == 400:
-                raise OperationFailedException(str(he))
-            else:
-                raise
+        self.post('oneshot', name=path, **kwargs)
 
 
 class Job(Entity):
@@ -2779,11 +2758,7 @@ def create(self, query, **kwargs):
         """
         if kwargs.get("exec_mode", None) == "oneshot":
             raise TypeError("Cannot specify exec_mode=oneshot; use the oneshot method instead.")
-        try:
-            response = self.post(search=query, **kwargs)
-        except HTTPError as he:
-            if he.status == 400: # Bad request. Raise a TypeError with the reason.
-                raise TypeError(str(he))
+        response = self.post(search=query, **kwargs)
         sid = _load_sid(response)
         return Job(self.service, sid)
 
@@ -2820,13 +2795,7 @@ def export(self, query, **params):
         """
         if "exec_mode" in params:
             raise TypeError("Cannot specify an exec_mode to export.")
-        try:
-            return self.post(path_segment="export", search=query, **params).body
-        except HTTPError as he:
-            if he.status == 400:
-                raise ValueError(str(he))
-            else:
-                raise
+        return self.post(path_segment="export", search=query, **params).body
 
     def itemmeta(self):
         """There is no metadata available for class:``Jobs``.
@@ -2883,13 +2852,8 @@ def oneshot(self, query, **params):
         """
         if "exec_mode" in params:
             raise TypeError("Cannot specify an exec_mode to oneshot.")
-        try:
-            return self.post(search=query, exec_mode="oneshot", **params).body
-        except HTTPError as he:
-            if he.status == 400:
-                raise ValueError(str(he))
-            else:
-                raise
+        return self.post(search=query, exec_mode="oneshot", **params).body
+
 
 class Loggers(Collection):
     """This class represents a collection of service logging categories.

tests/test_input.py

@@ -13,6 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+from splunklib.binding import HTTPError
 
 import testlib
 import logging
@@ -196,7 +197,7 @@ def f():
 
     def test_oneshot_on_nonexistant_file(self):
         name = testlib.tmpname()
-        self.assertRaises(client.OperationFailedException,
+        self.assertRaises(HTTPError,
             self.service.inputs.oneshot, name)
 
 class TestInput(testlib.SDKTestCase):

tests/test_job.py

@@ -50,7 +50,7 @@ def test_oneshot(self):
 
     def test_export_with_garbage_fails(self):
         jobs = self.service.jobs
-        self.assertRaises(ValueError, jobs.export, "asdaf;lkj2r23=")
+        self.assertRaises(client.HTTPError, jobs.export, "asdaf;lkj2r23=")
 
     def test_export(self):
         jobs = self.service.jobs
@@ -68,8 +68,8 @@ def test_normal_job_with_garbage_fails(self):
         try:
             bad_search = "abcd|asfwqqq"
             jobs.create(bad_search)
-        except TypeError as te:
-            self.assertTrue('abcd' in str(te))
+        except client.HTTPError as he:
+            self.assertTrue('abcd' in str(he))
             return
         self.fail("Job with garbage search failed to raise TypeError.")