Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some typos. #1496

Merged
merged 1 commit into from
Aug 8, 2021
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
6 changes: 3 additions & 3 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
* 2.10.2
* Added support for Hiredis's new bytearray support. Thanks
https://github.com/tzickel
* POSSIBLE BACKWARDS INCOMPATBLE CHANGE: Fixed a possible race condition
* POSSIBLE BACKWARDS INCOMPATIBLE CHANGE: Fixed a possible race condition
when multiple threads share the same Lock instance with a timeout. Lock
tokens are now stored in thread local storage by default. If you have
code that acquires a lock in one thread and passes that lock instance to
Expand Down Expand Up @@ -455,12 +455,12 @@
* Fixed Sentinel state parsing on Python 3.
* Added support for SENTINEL MONITOR, SENTINEL REMOVE, and SENTINEL SET
commands. Thanks Greg Murphy.
* INFO ouput that doesn't follow the "key:value" format will now be
* INFO output that doesn't follow the "key:value" format will now be
appended to a key named "__raw__" in the INFO dictionary. Thanks Pedro
Larroy.
* The "vagrant" directory contains a complete vagrant environment for
redis-py developers. The environment runs a Redis master, a Redis slave,
and 3 Sentinels. Future iterations of the test sutie will incorporate
and 3 Sentinels. Future iterations of the test suite will incorporate
more integration style tests, ensuring things like failover happen
correctly.
* It's now possible to create connection pool instances from a URL.
Expand Down
12 changes: 6 additions & 6 deletions redis/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ def parse_georadius_generic(response, **options):
'withhash': int
}

# zip all output results with each casting functino to get
# zip all output results with each casting function to get
# the properly native Python value.
f = [lambda x: x]
f += [cast[o] for o in ['withdist', 'withhash', 'withcoord'] if options[o]]
Expand Down Expand Up @@ -535,7 +535,7 @@ def parse_client_info(value):
key, value = info.split("=")
client_info[key] = value

# Those fields are definded as int in networking.c
# Those fields are defined as int in networking.c
for int_key in {"id", "age", "idle", "db", "sub", "psub",
"multi", "qbuf", "qbuf-free", "obl",
"oll", "omem"}:
Expand Down Expand Up @@ -1567,7 +1567,7 @@ def append(self, key, value):
def bitcount(self, key, start=None, end=None):
"""
Returns the count of set bits in the value of ``key``. Optional
``start`` and ``end`` paramaters indicate which bytes to consider
``start`` and ``end`` parameters indicate which bytes to consider
"""
params = [key]
if start is not None and end is not None:
Expand Down Expand Up @@ -1595,7 +1595,7 @@ def bitop(self, operation, dest, *keys):
def bitpos(self, key, bit, start=None, end=None):
"""
Return the position of the first bit set to 1 or 0 in a string.
``start`` and ``end`` difines search range. The range is interpreted
``start`` and ``end`` defines search range. The range is interpreted
as a range of bytes and not a range of bits, so start=0 and end=2
means to look at the first three bytes.
"""
Expand Down Expand Up @@ -2430,7 +2430,7 @@ def xack(self, name, groupname, *ids):
Acknowledges the successful processing of one or more messages.
name: name of the stream.
groupname: name of the consumer group.
*ids: message ids to acknowlege.
*ids: message ids to acknowledge.
"""
return self.execute_command('XACK', name, groupname, *ids)

Expand Down Expand Up @@ -4213,7 +4213,7 @@ def __call__(self, keys=[], args=[], client=None):
try:
return client.evalsha(self.sha, len(keys), *args)
except NoScriptError:
# Maybe the client is pointed to a differnet server than the client
# Maybe the client is pointed to a different server than the client
# that created this instance?
# Overwrite the sha just in case there was a discrepancy.
self.sha = client.script_load(self.script)
Expand Down
4 changes: 2 additions & 2 deletions redis/sentinel.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def master_for(self, service_name, redis_class=Redis,
Returns a redis client instance for the ``service_name`` master.

A :py:class:`~redis.sentinel.SentinelConnectionPool` class is
used to retrive the master's address before establishing a new
used to retrieve the master's address before establishing a new
connection.

NOTE: If the master's address has changed, any cached connections to
Expand Down Expand Up @@ -274,7 +274,7 @@ def slave_for(self, service_name, redis_class=Redis,
"""
Returns redis client instance for the ``service_name`` slave(s).

A SentinelConnectionPool class is used to retrive the slave's
A SentinelConnectionPool class is used to retrieve the slave's
address before establishing a new connection.

By default clients will be a :py:class:`~redis.Redis` instance.
Expand Down