Skip to content

Commit 4036581

Browse files
committed
Edits to additions, more cleanup
Edited new stuff Fred added, fixed intradoc links, more nitpicks.
1 parent 9f92cf2 commit 4036581

File tree

1 file changed

+24
-31
lines changed

1 file changed

+24
-31
lines changed

splunklib/client.py

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,8 +1233,8 @@ def _entity_path(self, state):
12331233
prefixes from it to leave only the relative path of the entity
12341234
itself, sans namespace.
12351235
1236+
:return: An absolute path
12361237
:rtype: ``string``
1237-
:return: an absolute path
12381238
"""
12391239
# This has been factored out so that it can be easily
12401240
# overloaded by Configurations, which has to switch its
@@ -2240,8 +2240,7 @@ def kinds(self, subpath=[]):
22402240
:param subpath: The relative endpoint path.
22412241
:type subpath: ``string``
22422242
2243-
:return: The list of input kinds.
2244-
:rtype: ``list``
2243+
:return: A ``list`` of input kinds.
22452244
"""
22462245
return self._get_kind_list()
22472246

@@ -2272,8 +2271,7 @@ def kindpath(self, kind):
22722271
22732272
:type kind: ``string``
22742273
2275-
:return: The relative endpoint path.
2276-
:rtype: ``string``
2274+
:return: A ``string`` containing the relative endpoint path.
22772275
"""
22782276
if kind in self.kinds:
22792277
return kind
@@ -2338,8 +2336,7 @@ def list(self, *kinds, **kwargs):
23382336
:type kwargs: ``dict``
23392337
23402338
2341-
:return: A list of input kinds.
2342-
:rtype: ``list``
2339+
:return: A ``list`` of input kinds.
23432340
"""
23442341
if len(kinds) == 0:
23452342
kinds = self.kinds
@@ -2500,7 +2497,7 @@ def disable_preview(self):
25002497
def enable_preview(self):
25012498
"""Enables preview for this job.
25022499
2503-
**Note**: Enabling preview might slow search considerably.
2500+
**Note**: Enabling preview might slow search considerably.
25042501
25052502
:return: The :class:`Job`.
25062503
"""
@@ -2556,8 +2553,7 @@ def is_ready(self):
25562553
def name(self):
25572554
"""Returns the name of the search job, which is the search ID (SID).
25582555
2559-
:return: The search ID.
2560-
:rtype: ``string``
2556+
:return: A ``string`` containing the search ID.
25612557
"""
25622558
return self.sid
25632559

@@ -2878,11 +2874,11 @@ def export(self, query, **params):
28782874
raise
28792875

28802876
def itemmeta(self):
2881-
"""There is no metadata available for class:``Jobs``.
2877+
"""Metadata is not available for :class:`Jobs`.
28822878
2883-
Any call to this method raises a class:``NotSupportedError``.
2879+
Any call to this method raises a :class:`NotSupportedError`.
28842880
2885-
:raises: class:``NotSupportedError``
2881+
:raises: :class:`NotSupportedError`
28862882
"""
28872883
raise NotSupportedError()
28882884

@@ -2947,11 +2943,11 @@ def __init__(self, service):
29472943
Collection.__init__(self, service, PATH_LOGGER)
29482944

29492945
def itemmeta(self):
2950-
"""There is no metadata available for class:``Jobs``.
2946+
"""Metadata is not available for :class:`Jobs`.
29512947
2952-
Any call to this method raises a class:``NotSupportedError``.
2948+
Any call to this method raises a :class:`NotSupportedError`.
29532949
2954-
:raises: class:``NotSupportedError``
2950+
:raises: :class:`NotSupportedError`
29552951
"""
29562952
raise NotSupportedError()
29572953

@@ -2991,13 +2987,14 @@ def arguments(self):
29912987
29922988
The keys in the dictionary are the names of the arguments. The values are
29932989
another dictionary giving the metadata about that argument. The possible
2994-
keys in that dictionary are ``"title"``, ``"description"``, ``"required_on_create``",
2995-
``"required_on_edit"``, ``"data_type"``. Each value is a string. It should be one
2996-
of ``"true"`` or ``"false"`` for ``"required_on_create"`` and ``"required_on_edit"``,
2997-
and one of ``"boolean"``, ``"string"``, or ``"number``" for ``"data_type"``.
2990+
keys in that dictionary are:
2991+
"title": A ``string``.
2992+
"description": A ``string``.
2993+
"required_on_create": A ``string`` that is "true" or "false".
2994+
"required_on_edit": A ``string`` that is "true" or "false".
2995+
"data_type": A ``string`` that is "boolean", "string", or "number".
29982996
2999-
:return: A dictionary describing the arguments this modular input kind takes.
3000-
:rtype: ``dict``
2997+
:return: A ``dict`` of arguments that are supported by this modular input kind.
30012998
"""
30022999
return self.state.content['endpoint']['args']
30033000

@@ -3207,8 +3204,7 @@ class User(Entity):
32073204
def role_entities(self):
32083205
"""Returns a list of roles assigned to this user.
32093206
3210-
:return: The list of roles.
3211-
:rtype: ``list``
3207+
:return: The ``list`` of roles.
32123208
"""
32133209
return [self.service.roles[name] for name in self.content.roles]
32143210

@@ -3253,8 +3249,7 @@ def create(self, username, password, roles, **params):
32533249
on Splunk Developer Portal.
32543250
:type params: ``dict``
32553251
3256-
:return: The new user.
3257-
:rtype: :class:`User`
3252+
:return: The new :class:`User`.
32583253
32593254
**Example**::
32603255
@@ -3285,8 +3280,7 @@ def delete(self, name):
32853280
:param name: The name of the user to delete.
32863281
:type name: ``string``
32873282
3288-
:return:
3289-
:rtype: :class:`Users`
3283+
:return: The :class:`Users` collection.
32903284
"""
32913285
return Collection.delete(self, name.lower())
32923286

@@ -3390,8 +3384,7 @@ def create(self, name, **params):
33903384
on Splunk Developer Portal.
33913385
:type params: ``dict``
33923386
3393-
:return: The new role.
3394-
:rtype: :class:`Role`
3387+
:return: The new :class:`Role`.
33953388
33963389
**Example**::
33973390
@@ -3421,7 +3414,7 @@ def delete(self, name):
34213414
:param name: The name of the role to delete.
34223415
:type name: ``string``
34233416
3424-
:rtype: The :class:`Roles`
3417+
:return: The :class:`Roles` collection.
34253418
"""
34263419

34273420
return Collection.delete(self, name.lower())

0 commit comments

Comments
 (0)