Skip to content

Commit 12bcd40

Browse files
kraptorsylvinus
authored andcommitted
Update to support renaming of LuaLock to Lock in redis-py (#214)
* redis-py renamed LuaLock to lock * redis-py renamed LuaLock to Lock
1 parent 2158f00 commit 12bcd40

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

mrq/agent.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
import traceback
99
from collections import defaultdict
1010
from bson import ObjectId
11-
from redis.lock import LuaLock
11+
12+
try:
13+
from redis.lock import LuaLock
14+
except ImportError:
15+
from redis.lock import Lock
16+
1217
from .processes import Process, ProcessPool
1318
from .utils import MovingETA, normalize_command
1419
from .queue import Queue

mrq/worker.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
import json as json_stdlib
1616
import ujson as json
1717
from bson import ObjectId
18-
from redis.lock import LuaLock
18+
19+
try:
20+
from redis.lock import LuaLock
21+
except ImportError:
22+
from redis.lock import Lock
23+
1924
from collections import defaultdict
2025
from mrq.utils import load_class_by_path
2126

0 commit comments

Comments
 (0)