Skip to content

Avoid NameError when Lock is used in place of LuaLock #231

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.

Sign up for GitHub

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

Merged
sylvinus merged 2 commits into from
Dec 13, 2020
Merged

Avoid NameError when Lock is used in place of LuaLock #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1104312
Update agent.py
deveil Dec 12, 2020
11c297c
Update worker.py
deveil Dec 12, 2020
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
3 changes: 2 additions & 1 deletion mrq/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
try:
from redis.lock import LuaLock
except ImportError:
from redis.lock import Lock
# Change name to avoid NameError raised when use of LuaLock at line 147
from redis.lock import Lock as LuaLock

from .processes import Process, ProcessPool
from .utils import MovingETA, normalize_command
Expand Down
3 changes: 2 additions & 1 deletion mrq/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
try:
from redis.lock import LuaLock
except ImportError:
from redis.lock import Lock
# Change name to avoid NameError raised when use of LuaLock at line 151
from redis.lock import Lock as LuaLock

from collections import defaultdict
from mrq.utils import load_class_by_path
Expand Down