From cb696d296617add260f767255a616aedf7a31880 Mon Sep 17 00:00:00 2001 From: leela Date: Wed, 1 Sep 2021 08:23:04 +0530 Subject: [PATCH] fix: rq utiliy module conflicts with redis queue's rq package --- frappe/commands/__init__.py | 2 +- frappe/commands/{redis.py => redis_utils.py} | 2 +- frappe/tests/test_redis.py | 2 +- frappe/utils/background_jobs.py | 2 +- frappe/utils/{rq.py => redis_queue.py} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename frappe/commands/{redis.py => redis_utils.py} (97%) rename frappe/utils/{rq.py => redis_queue.py} (100%) diff --git a/frappe/commands/__init__.py b/frappe/commands/__init__.py index 6fb33a51b7..82a71ce7b4 100644 --- a/frappe/commands/__init__.py +++ b/frappe/commands/__init__.py @@ -102,7 +102,7 @@ def get_commands(): from .site import commands as site_commands from .translate import commands as translate_commands from .utils import commands as utils_commands - from .redis import commands as redis_commands + from .redis_utils import commands as redis_commands clickable_link = ( "\x1b]8;;https://frappeframework.com/docs\afrappeframework.com\x1b]8;;\a" diff --git a/frappe/commands/redis.py b/frappe/commands/redis_utils.py similarity index 97% rename from frappe/commands/redis.py rename to frappe/commands/redis_utils.py index 38a46c2142..3556050782 100644 --- a/frappe/commands/redis.py +++ b/frappe/commands/redis_utils.py @@ -3,7 +3,7 @@ import os import click import frappe -from frappe.utils.rq import RedisQueue +from frappe.utils.redis_queue import RedisQueue from frappe.installer import update_site_config @click.command('create-rq-users') diff --git a/frappe/tests/test_redis.py b/frappe/tests/test_redis.py index 72af1ac699..8dd50f2373 100644 --- a/frappe/tests/test_redis.py +++ b/frappe/tests/test_redis.py @@ -5,7 +5,7 @@ import redis import frappe from frappe.utils import get_bench_id -from frappe.utils.rq import RedisQueue +from frappe.utils.redis_queue import RedisQueue from frappe.utils.background_jobs import get_redis_conn def version_tuple(version): diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index b8f3372540..b2592e9e8f 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -16,7 +16,7 @@ import frappe from frappe import _ import frappe.monitor from frappe.utils import cstr, get_bench_id -from frappe.utils.rq import RedisQueue +from frappe.utils.redis_queue import RedisQueue from frappe.utils.commands import log diff --git a/frappe/utils/rq.py b/frappe/utils/redis_queue.py similarity index 100% rename from frappe/utils/rq.py rename to frappe/utils/redis_queue.py