From eb5bb6329c573bd4df65554ddac96543fa11370f Mon Sep 17 00:00:00 2001 From: Vincent Driessen Date: Mon, 2 Sep 2013 23:12:01 +0200 Subject: [PATCH] PEP8ify. --- rq/scripts/__init__.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/rq/scripts/__init__.py b/rq/scripts/__init__.py index 6fc89e4..575a8cb 100644 --- a/rq/scripts/__init__.py +++ b/rq/scripts/__init__.py @@ -6,27 +6,28 @@ from rq import use_connection def add_standard_arguments(parser): parser.add_argument('--config', '-c', default=None, - help='Module containing RQ settings.') + help='Module containing RQ settings.') parser.add_argument('--url', '-u', default=None, - help='URL describing Redis connection details. ' - 'Overrides other connection arguments if supplied.') + help='URL describing Redis connection details. ' + 'Overrides other connection arguments if supplied.') parser.add_argument('--host', '-H', default=None, - help='The Redis hostname (default: localhost)') + help='The Redis hostname (default: localhost)') parser.add_argument('--port', '-p', default=None, - help='The Redis portnumber (default: 6379)') + help='The Redis portnumber (default: 6379)') parser.add_argument('--db', '-d', type=int, default=None, - help='The Redis database (default: 0)') + help='The Redis database (default: 0)') parser.add_argument('--password', '-a', default=None, - help='The Redis password (default: None)') + help='The Redis password (default: None)') parser.add_argument('--socket', '-s', default=None, - help='The Redis Unix socket') + help='The Redis Unix socket') + def read_config_file(module): """Reads all UPPERCASE variables defined in the given module file.""" settings = importlib.import_module(module) return dict([(k, v) - for k, v in settings.__dict__.items() - if k.upper() == k]) + for k, v in settings.__dict__.items() + if k.upper() == k]) def setup_default_arguments(args, settings): @@ -35,9 +36,9 @@ def setup_default_arguments(args, settings): args.url = settings.get('REDIS_URL') if (args.host or args.port or args.socket or args.db or args.password): - warn('Host, port, db, password options for Redis will not be \ - supported in future versions of RQ. \ - Please use `REDIS_URL` or `--url` instead.', DeprecationWarning) + warn('Host, port, db, password options for Redis will not be ' + 'supported in future versions of RQ. ' + 'Please use `REDIS_URL` or `--url` instead.', DeprecationWarning) if args.host is None: args.host = settings.get('REDIS_HOST', 'localhost') @@ -63,5 +64,5 @@ def setup_redis(args): redis_conn = redis.StrictRedis.from_url(args.url) else: redis_conn = redis.StrictRedis(host=args.host, port=args.port, db=args.db, - password=args.password, unix_socket_path=args.socket) + password=args.password, unix_socket_path=args.socket) use_connection(redis_conn)