A number of small changes.

Rename Indexes.default to Indexes.get_default.
Removed the enable and disable methods on Index, since they weren't doing anything
that the Entity method wasn't already doing.
Moved reenabling the index at the end of Index.clean to before throwing an exception
if the clean didn't leave the index empty.

Author: Frederick Ross

splunklib/client.py

@@ -1713,7 +1713,7 @@ class Indexes(Collection):
     """This class contains the collection of indexes in this Splunk instance.
     Retrieve this collection using :meth:`Service.indexes`.
     """
-    def default(self):
+    def get_default(self):
         """ Returns the default index.
 
         :return: An :class:`Index` object.
@@ -1843,33 +1843,14 @@ def clean(self, timeout=60):
         finally:
             # Restore original values
             self.update(maxTotalDataSizeMB=tds, frozenTimePeriodInSecs=ftp)
-            if self.content.totalEventCount != '0':
-                raise OperationError, "Cleaning index %s took longer than %s seconds; timing out." % \
-                                      (self.name, timeout)
             if (not was_disabled_initially and \
                 self.service.splunk_version < (5,)):
                 # Re-enable the index if it was originally enabled and we messed with it.
                 self.enable()
-        return self
-
-    def disable(self):
-        """Disables this index.
-
-        :return: The :class:`Index`.
-        """
-        # Starting in Ace, we have to do this with specific sharing,
-        # unlike most other entities.
-        self.post("disable")
-        return self
-
-    def enable(self):
-        """Enables this index.
+            if self.content.totalEventCount != '0':
+                raise OperationError, "Cleaning index %s took longer than %s seconds; timing out." %\
+                                      (self.name, timeout)
 
-        :return: The :class:`Index`.
-        """
-        # Starting in Ace, we have to reenable this with a specific
-        # sharing unlike most other entities.
-        self.post("enable")
         return self
 
     def roll_hot_buckets(self):

tests/test_index.py

@@ -57,7 +57,7 @@ def test_integrity(self):
         self.check_entity(self.index)
 
     def test_default(self):
-        default = self.service.indexes.default()
+        default = self.service.indexes.get_default()
         self.assertTrue(isinstance(default, str))
 
     def test_disable_enable(self):