Skip to content

Commit 6f49353

Browse files
committed
Fix some lint. Release as 0.1.10
1 parent 794884a commit 6f49353

File tree

8 files changed

+29
-21
lines changed

8 files changed

+29
-21
lines changed

Diff for: mrq/basetasks/utils.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ def run(self, params):
2424

2525
query = self.build_query()
2626

27-
return self.perform_action(self.params.get("action"), query, self.params.get("destination_queue"))
27+
return self.perform_action(
28+
self.params.get("action"), query, self.params.get("destination_queue")
29+
)
2830

2931
def build_query(self):
3032
query = {}

Diff for: mrq/config.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def add_parser_args(parser, config_type):
6363
'--mongodb_logs',
6464
action='store',
6565
default="1",
66-
help='MongoDB URI for the logs database. If set to "0", will disable remote logs. If set to "1", will use main MongoDB.')
66+
help='MongoDB URI for the logs database. ' +
67+
' "0" will disable remote logs, "1" will use main MongoDB.')
6768

6869
parser.add_argument(
6970
'--mongodb_logs_size',
@@ -142,7 +143,7 @@ def add_parser_args(parser, config_type):
142143
default=7 * 24 * 3600,
143144
action='store',
144145
type=int,
145-
help='Seconds the results are kept in MongoDB when status in ("success", "cancel", "abort")')
146+
help='Seconds the results are kept in MongoDB when status in (success, cancel, abort)')
146147

147148
parser.add_argument(
148149
'--default_job_timeout',

Diff for: mrq/context.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def _connections_factory(attr):
133133

134134
if attr == "mongodb_logs" and config_obj == "1":
135135
return connections.mongodb_jobs
136-
elif config_obj in ("0"):
136+
elif config_obj == "0":
137137
return None
138138

139139
try:
@@ -257,20 +257,20 @@ def set_current_job_progress(ratio, save=False):
257257

258258
# Imports for backward compatibility
259259
def queue_raw_jobs(*args, **kwargs):
260-
from .job import queue_raw_jobs
261-
return queue_raw_jobs(*args, **kwargs)
260+
from . import job
261+
return job.queue_raw_jobs(*args, **kwargs)
262262

263263

264264
def queue_job(*args, **kwargs):
265-
from .job import queue_job
266-
return queue_job(*args, **kwargs)
265+
from . import job
266+
return job.queue_job(*args, **kwargs)
267267

268268

269269
def queue_jobs(*args, **kwargs):
270-
from .job import queue_jobs
271-
return queue_jobs(*args, **kwargs)
270+
from . import job
271+
return job.queue_jobs(*args, **kwargs)
272272

273273

274274
def metric(*args, **kwargs):
275-
from .helpers import metric
276-
return metric(*args, **kwargs)
275+
from . import helpers
276+
return helpers.metric(*args, **kwargs)

Diff for: mrq/dashboard/app.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ def build_api_datatables_query(req):
130130
if req.args.get(param):
131131
query[param] = req.args.get(param)
132132
if req.args.get("status"):
133-
statuses = req.args.get(param).split("-")
133+
statuses = req.args["status"].split("-")
134134
if len(statuses) == 1:
135-
query[param] = statuses[0]
135+
query["status"] = statuses[0]
136136
else:
137-
query[param] = {"$in": statuses}
137+
query["status"] = {"$in": statuses}
138138
if req.args.get("id"):
139139
query["_id"] = ObjectId(req.args.get("id"))
140140
if req.args.get("worker"):

Diff for: mrq/exceptions.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def _get_exception_name(self):
1313
def __str__(self):
1414
s = self._get_exception_name()
1515
if self.original_exception is not None:
16-
s += "\n---- Original exception: -----\n%s" % ("".join(traceback.format_exception(*self.original_exception)))
16+
tb = "".join(traceback.format_exception(*self.original_exception))
17+
s += "\n---- Original exception: -----\n%s" % tb
1718

1819
return s
1920

@@ -32,7 +33,9 @@ class RetryInterrupt(_MrqInterrupt):
3233
retry_count = 0
3334

3435
def _get_exception_name(self):
35-
return "%s #%s: %s seconds, %s queue" % (self.__class__.__name__, self.retry_count, self.delay, self.queue)
36+
return "%s #%s: %s seconds, %s queue" % (
37+
self.__class__.__name__, self.retry_count, self.delay, self.queue
38+
)
3639

3740

3841
class MaxRetriesInterrupt(_MrqInterrupt):

Diff for: mrq/job.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import traceback
1212
import sys
1313

14-
import context
14+
from . import context
1515

1616

1717
class Job(object):

Diff for: mrq/queue.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from .redishelpers import redis_group_command
33
import time
44
from bson import ObjectId
5-
import context
5+
from . import context
66

77

88
class Queue(object):
@@ -125,7 +125,9 @@ def list_job_ids(self, skip=0, limit=20):
125125
skip + limit - 1))
126126
# SET
127127
elif self.is_set:
128-
return self.unserialize_job_ids(context.connections.redis.srandmember(self.redis_key, limit))
128+
return self.unserialize_job_ids(
129+
context.connections.redis.srandmember(self.redis_key, limit)
130+
)
129131
# LIST
130132
else:
131133
return self.unserialize_job_ids(context.connections.redis.lrange(

Diff for: mrq/redishelpers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .utils import memoize
2-
import context
2+
from . import context
33

44

55
@memoize

0 commit comments

Comments
 (0)