Skip to content

Commit fdb0265

Browse files
authored
Merge branch 'master' into typing_for_client_init
2 parents 4fd061d + 4d5e417 commit fdb0265

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

doctests/dt_list.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,20 +165,20 @@
165165
# REMOVE_END
166166

167167
# STEP_START ltrim
168-
res27 = r.lpush("bikes:repairs", "bike:1", "bike:2", "bike:3", "bike:4", "bike:5")
168+
res27 = r.rpush("bikes:repairs", "bike:1", "bike:2", "bike:3", "bike:4", "bike:5")
169169
print(res27) # >>> 5
170170

171171
res28 = r.ltrim("bikes:repairs", 0, 2)
172172
print(res28) # >>> True
173173

174174
res29 = r.lrange("bikes:repairs", 0, -1)
175-
print(res29) # >>> ['bike:5', 'bike:4', 'bike:3']
175+
print(res29) # >>> ['bike:1', 'bike:2', 'bike:3']
176176
# STEP_END
177177

178178
# REMOVE_START
179179
assert res27 == 5
180180
assert res28 is True
181-
assert res29 == ["bike:5", "bike:4", "bike:3"]
181+
assert res29 == ["bike:1", "bike:2", "bike:3"]
182182
r.delete("bikes:repairs")
183183
# REMOVE_END
184184

redis/asyncio/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ async def _disconnect_raise_reset(self, conn: Connection, error: Exception):
15541554
await self.reset()
15551555
raise
15561556

1557-
async def execute(self, raise_on_error: bool = True):
1557+
async def execute(self, raise_on_error: bool = True) -> List[Any]:
15581558
"""Execute all the commands in the current pipeline"""
15591559
stack = self.command_stack
15601560
if not stack and not self.watching:

redis/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ def _disconnect_raise_reset(
15691569
self.reset()
15701570
raise error
15711571

1572-
def execute(self, raise_on_error=True):
1572+
def execute(self, raise_on_error: bool = True) -> List[Any]:
15731573
"""Execute all the commands in the current pipeline"""
15741574
stack = self.command_stack
15751575
if not stack and not self.watching:

redis/cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2050,7 +2050,7 @@ def annotate_exception(self, exception, number, command):
20502050
)
20512051
exception.args = (msg,) + exception.args[1:]
20522052

2053-
def execute(self, raise_on_error=True):
2053+
def execute(self, raise_on_error: bool = True) -> List[Any]:
20542054
"""
20552055
Execute all the commands in the current pipeline
20562056
"""

0 commit comments

Comments
 (0)