Removed unecessary handling. Changed test_collection.py

Author: Sam Stelle

splunklib/client.py

@@ -1540,7 +1540,7 @@ def delete(self, name, **params):
                 raise KeyError("No such entity %s" % name)
             else:
                 raise
-        return
+        return self
 
     def get(self, name="", owner=None, app=None, sharing=None, **query):
         """Performs a GET request to the server on the collection.
@@ -2018,13 +2018,6 @@ def __getitem__(self, key):
         if isinstance(key, tuple) and len(key) == 2:
             # Fetch a single kind
             key, kind = key
-            if kind == "script":
-                keylist = key.split('/')
-                applist = [app.name for app in self.service.apps]
-                for i in range(len(keylist)):
-                    if keylist[i] == "apps" and keylist[i+1] in applist:
-                        newkey = [keylist[x] for x in range(i + 2, len(keylist))]
-                        key = "./" + ('/').join(newkey)
             key = UrlEncoded(key, encode_slash=True)
             try:
                 response = self.get(self.kindpath(kind) + "/" + key)
@@ -2044,12 +2037,6 @@ def __getitem__(self, key):
             # Iterate over all the kinds looking for matches.
             kind = None
             candidate = None
-            keylist = key.split('/')
-            applist = [app.name for app in self.service.apps]
-            for i in range(len(keylist)):
-                if keylist[i] == "apps" and keylist[i+1] in applist:
-                    newkey = [keylist[x] for x in range(i + 2, len(keylist))]
-                    key = "./" + ('/').join(newkey)
             key = UrlEncoded(key, encode_slash=True)
             for kind in self.kinds:
                 try:
@@ -2226,7 +2213,7 @@ def itemmeta(self, kind):
     def _get_kind_list(self, subpath=None):
         if subpath is None:
             subpath = []
-            
+
         kinds = []
         response = self.get('/'.join(subpath))
         content = _load_atom_entries(response)

tests/test_collection.py

@@ -250,7 +250,9 @@ def test_collection_search_get(self):
             self.assertEqual(200, self.service.saved_searches.get(search.name).status)
 
     def test_collection_inputs_getitem(self):
-        for inp in self.service.inputs:
+        valid_kinds = self.service.inputs._get_kind_list()
+        valid_kinds.remove("script")
+        for inp in self.service.inputs.list(*valid_kinds):
             self.assertTrue(self.service.inputs[inp.name])