Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/analytics/bottle.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ def __init__(self, catchall=True, autojson=True, config=None):

self.mounts = {}
self.error_handler = {}
#: If true, most exceptions are catched and returned as :exc:`HTTPError`
#: If true, most exceptions are caught and returned as :exc:`HTTPError`
self.catchall = catchall
self.config = config or {}
self.serve = True
Expand Down Expand Up @@ -638,8 +638,8 @@ def remove_hook(self, name, func):

def handle(self, path, method='GET'):
""" (deprecated) Execute the first matching route callback and return
the result. :exc:`HTTPResponse` exceptions are catched and returned.
If :attr:`Bottle.catchall` is true, other exceptions are catched as
the result. :exc:`HTTPResponse` exceptions are caught and returned.
If :attr:`Bottle.catchall` is true, other exceptions are caught as
well and returned as :exc:`HTTPError` instances (500).
"""
depr("This method will change semantics in 0.10. Try to avoid it.")
Expand Down Expand Up @@ -1081,7 +1081,7 @@ def set_cookie(self, key, value, secret=None, **kargs):
:param value: the value of the cookie.
:param secret: required for signed cookies. (default: None)
:param max_age: maximum age in seconds. (default: None)
:param expires: a datetime object or UNIX timestamp. (defaut: None)
:param expires: a datetime object or UNIX timestamp. (default: None)
:param domain: the domain that is allowed to read the cookie.
(default: current domain)
:param path: limits the cookie to a given path (default: /)
Expand Down
2 changes: 1 addition & 1 deletion examples/analytics/js/jquery.flot.selection.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ you want to know what's happening while it's happening,
A "plotunselected" event with no arguments is emitted when the user
clicks the mouse to remove the selection.

The plugin allso adds the following methods to the plot object:
The plugin also adds the following methods to the plot object:

- setSelection(ranges, preventEvent)

Expand Down
2 changes: 1 addition & 1 deletion examples/async/async.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def do_search(query):
return results

# We specify many queries to get show the advantages
# of paralleism.
# of parallelism.
queries = [
'search * | head 100',
'search * | head 100',
Expand Down
2 changes: 1 addition & 1 deletion examples/handlers/tiny-proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def daemonize(logger, opts):
sys.exit(0)
else:
if os.fork () != 0:
## allow the child pid to instanciate the server
## allow the child pid to instantiate the server
## class
time.sleep (1)
sys.exit (0)
Expand Down
2 changes: 1 addition & 1 deletion examples/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# All job commands operate on search 'specifiers' (spec). A search specifier
# is either a search-id (sid) or the index of the search job in the list of
# jobs, eg: @0 would specify the frist job in the list, @1 the second, and so
# jobs, eg: @0 would specify the first job in the list, @1 the second, and so
# on.

from __future__ import absolute_import
Expand Down
2 changes: 1 addition & 1 deletion splunklib/binding.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def __init__(self, message, cause):
#

# Encode the given kwargs as a query string. This wrapper will also _encode
# a list value as a sequence of assignemnts to the corresponding arg name,
# a list value as a sequence of assignments to the corresponding arg name,
# for example an argument such as 'foo=[1,2,3]' will be encoded as
# 'foo=1&foo=2&foo=3'.
def _encode(**kwargs):
Expand Down
2 changes: 1 addition & 1 deletion splunklib/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ class Entity(Endpoint):
ent.whitelist

However, because some of the field names are not valid Python identifiers,
the dictionary-like syntax is preferrable.
the dictionary-like syntax is preferable.

The state of an :class:`Entity` object is cached, so accessing a field
does not contact the server. If you think the values on the
Expand Down
2 changes: 1 addition & 1 deletion tests/test_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

import pytest

# TODO: Determine if we should be importing ExpatError if ParseError is not avaialble (e.g., on Python 2.6)
# TODO: Determine if we should be importing ExpatError if ParseError is not available (e.g., on Python 2.6)
# There's code below that now catches SyntaxError instead of ParseError. Should we be catching ExpathError instead?

# from xml.etree.ElementTree import ParseError
Expand Down