Skip to content

Commit e313d8a

Browse files
author
Shakeel Mohamed
committed
Merge branch 'develop' into bug/namespace-for-server-endpoints
2 parents 3315a3e + 6eab32d commit e313d8a

40 files changed

+1449
-1614
lines changed

‎examples/analytics/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ meant to manage input and output of data into Splunk.
1919
### AnalyticsTracker
2020

2121
The `input.py` file defines the "input" side of the Analytics service. If you
22-
wanted to log some analytics data in your app, you would the `AnalyticsTracker`
22+
wanted to log some analytics data in your app, you would have the `AnalyticsTracker`
2323
class defined in this file in order to do so.
2424

2525
The `AnalyticsTracker` class encapsulates all the information required to log
@@ -73,7 +73,7 @@ Similarly to `AnalyticsTracker`, the `output.py` file defines the "output" side
7373
of the Analytics service. If you want to extract the events you logged in using
7474
`AnalyticsTracker`, you'd use the `AnalyticsRetriever` class.
7575

76-
Creating an `AnalyticsTracker` instance is identical to the `AnalyticsTracker`:
76+
Creating an `AnalyticsRetriever` instance is identical to the `AnalyticsTracker`:
7777

7878
```python
7979
from analytics.output import AnalyticsRetriever
@@ -138,7 +138,7 @@ you can see a graph of events over time, properties, etc.
138138

139139
We make use of the excellent open source
140140
[flot](http://code.google.com/p/flot/) graphing library to render
141-
our Javascript graphs. We also use the [`bottle.py`](bottlepy.org)
141+
our Javascript graphs. We also use the [`bottle.py`](http://bottlepy.org)
142142
micro-web framework.
143143

144144
## Running the Sample

‎examples/analytics/input.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def __init__(self, application_name, splunk_info, index = ANALYTICS_INDEX_NAME):
5959

6060
@staticmethod
6161
def encode(props):
62-
encoded = " ";
62+
encoded = " "
6363
for k,v in props.iteritems():
6464
# We disallow dictionaries - it doesn't quite make sense.
6565
assert(not isinstance(v, dict))

‎examples/explorer/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def make_request(self, url, method, data, headers):
114114
response_file = StringIO.StringIO(response_text)
115115

116116
# On errors, we also log the response text
117-
self.log_message("Response: %s", response_text);
117+
self.log_message("Response: %s", response_text)
118118

119119
# Send the error response code
120120
self.send_response(e.code, message=e.msg)

‎examples/export/export.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def main():
328328
service = connect(**options.kwargs)
329329

330330
if path.exists(options.kwargs['output']):
331-
if options.kwargs['recover'] == False:
331+
if not options.kwargs['recover']:
332332
print "Export file %s exists, and recover option nor specified" % \
333333
options.kwargs['output']
334334
sys.exit(1)

‎examples/github_forks/github_forks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def get_scheme(self):
5050
scheme.use_single_instance = True
5151

5252
owner_argument = Argument("owner")
53+
owner_argument.title = "Owner"
5354
owner_argument.data_type = Argument.data_type_string
5455
owner_argument.description = "Github user or organization that created the repository."
5556
owner_argument.required_on_create = True
@@ -59,6 +60,7 @@ def get_scheme(self):
5960
scheme.add_argument(owner_argument)
6061

6162
repo_name_argument = Argument("repo_name")
63+
repo_name_argument.title = "Repo Name"
6264
repo_name_argument.data_type = Argument.data_type_string
6365
repo_name_argument.description = "Name of the Github repository."
6466
repo_name_argument.required_on_create = True

‎examples/random_numbers/random_numbers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def get_scheme(self):
5050
scheme.use_single_instance = True
5151

5252
min_argument = Argument("min")
53+
min_argument.title = "Minimum"
5354
min_argument.data_type = Argument.data_type_number
5455
min_argument.description = "Minimum random number to be produced by this input."
5556
min_argument.required_on_create = True
@@ -59,6 +60,7 @@ def get_scheme(self):
5960
scheme.add_argument(min_argument)
6061

6162
max_argument = Argument("max")
63+
max_argument.title = "Maximum"
6264
max_argument.data_type = Argument.data_type_number
6365
max_argument.description = "Maximum random number to be produced by this input."
6466
max_argument.required_on_create = True

‎examples/saved_search/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ saved search actions.
88
`list` and `delete` requires the `--name` argument to either list the contents
99
of a specific saved search or delete a specific saved search.
1010

11-
`create` requires the `--name` argument, as well as a littany of other arguments
11+
`create` requires the `--name` argument, as well as a list of any other arguments
1212
to establish a saved search. The help output is seen below.
1313

1414
Of special note is the events that can perform actions (`--actions` and

‎examples/saved_search/saved_search.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ def main(argv):
174174
if key == "operation":
175175
operation = opts.kwargs[key]
176176
else:
177-
kwargs[key] = urllib.quote(opts.kwargs[key])
177+
kwargs[key] = opts.kwargs[key]
178178

179179
# no operation? if name present, default to list, otherwise list-all
180180
if not operation:
181181
if kwargs.has_key('name'):
182182
operation = 'list'
183183
else:
184184
operation = 'list-all'
185-
185+
186186
# pre-sanitize
187187
if (operation != "list" and operation != "create"
188188
and operation != "delete"

‎examples/searchcommands_app/bin/simulate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class SimulateCommand(GeneratingCommand):
8686

8787
def generate(self):
8888
""" Yields one random record at a time for the duration of `duration` """
89-
self.logger.debug('SimulateCommand: %s' % self) # log command line
89+
self.logger.debug('SimulateCommand: %s', self) # log command line
9090
if not self.records:
9191
if self.seed is not None:
9292
random.seed(self.seed)

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def run(self):
168168
sdk_dir = os.path.abspath('.')
169169

170170
def exclude(path):
171-
# TODO: Replace with filter function because exclude is deprecated
171+
# TODO: DVPL-5866 - Replace with filter function because exclude is deprecated
172172
basename = os.path.basename(path)
173173
for pattern in ['.DS_Store', '.idea', '*.log', '*.py[co]']:
174174
if fnmatch(basename, pattern):

0 commit comments

Comments
 (0)