Skip to content

Commit 796acbc

Browse files
committed
PEP8 styles fixes
1 parent 72dcb62 commit 796acbc

17 files changed

+365
-119
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ install_deps:
2929
run_test:
3030
@echo "Running \033[0;32mtest suite\033[0m "; \
3131
AWS_DEFAULT_REGION='us-east-1' nosetests --stop --with-coverage --cover-package=$(PACKAGE) \
32-
--cover-branches --cover-erase --verbosity=2; \
32+
--cover-branches --cover-erase --verbosity=2; pycodestyle; \
3333

3434
test: prepare
3535
@make run_test

development.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ nose==1.3.0
55
pre-commit==0.7.6
66
sure==1.2.2
77
functools32;python_version=='2.7'
8+
pycodestyle==2.4.0

example/api/example.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
blueprint = Blueprint('api', __name__)
88

9+
910
@blueprint.route('/example', methods=['POST'])
1011
def example():
1112
queues = current_app.config.get('QUEUES')
@@ -18,23 +19,30 @@ def example():
1819
message_data = json.loads(data)
1920
except (TypeError, AttributeError, ValueError) as e:
2021
status = 500
21-
return construct_response('Your payload does not appear to be valid json!', data, status)
22+
return construct_response(
23+
'Your payload does not appear to be valid json!', data, status)
2224

2325
try:
2426
tasks.process.delay(message=message_data)
25-
response_message = f'Successfully submitted message to queue {queue_name}'
27+
response_message = (
28+
f'Successfully submitted message to queue {queue_name}'
29+
)
2630
status = 200
2731
except Exception as e:
28-
response_message = f'Something went wrong submitting message to queue {queue_name}! {e}'
32+
response_message = (
33+
f'Something went wrong submitting message '
34+
'to queue {queue_name}! {e}'
35+
)
2936
status = 500
30-
37+
3138
return construct_response(response_message, message_data, status)
3239

3340

3441
@blueprint.route('/health', methods=['GET'])
3542
def health():
3643
return jsonify('OK'), 200
3744

45+
3846
@blueprint.route('/', methods=['GET'])
3947
def hello():
4048
return 'Hello!'

example/api/helpers.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
import logging
33
from flask import jsonify
44

5+
56
def construct_response(message, payload, status):
67
body = {}
78

89
if status == 500:
9-
body['message'] = 'Something went wrong constructing response. Is your payload valid JSON?'
10+
body['message'] = (
11+
'Something went wrong constructing response. '
12+
'Is your payload valid JSON?'
13+
)
1014
body['request_payload'] = str(payload)
1115
else:
1216
body['message'] = message

example/api/tasks.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
from flask import Flask, current_app
33
from pyqs import task
44

5+
56
# This task listens to 'queue-example' SQS queues for messages with
67
# {"task": "process"}
78
@task(queue='queue-example')
89
def process(message):
9-
logging.info(f'PyQS task process() is processing message {message}. Clap your hands!')
10+
logging.info(
11+
f'PyQS task process() is processing message {message}. '
12+
'Clap your hands!'
13+
)

example/app.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
config_name = os.environ.get('ENV', 'development')
77
current_config = config[config_name]
88

9+
910
def create_app():
1011
app = Flask(__name__)
1112
app.config.from_object(current_config)
1213

1314
return app
1415

16+
1517
app = create_app()
1618
app.register_blueprint(example_blueprint)
1719

example/config/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
config = {
44
'development': DevelopmentConfig
5-
#'production': ProductionConfig
5+
# 'production': ProductionConfig
66
}

example/config/common.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
22
import logging
33

4+
45
class Config(object):
56

67
AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID')

example/config/development.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from .common import Config
22

3+
34
class DevelopmentConfig(Config):
45
DEBUG = True
56

pyqs/decorator.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ def get_or_create_queue(queue_name):
1818
try:
1919
return sqs.get_queue_by_name(QueueName=queue_name)
2020
except ClientError as exc:
21-
if exc.response['Error']['Code'] == 'AWS.SimpleQueueService.NonExistentQueue':
21+
non_existent_code = 'AWS.SimpleQueueService.NonExistentQueue'
22+
if exc.response['Error']['Code'] == non_existent_code:
2223
return sqs.create_queue(QueueName=queue_name)
2324
else:
2425
raise
2526

2627

27-
def task_delayer(func_to_delay, queue_name, delay_seconds=None, override=False):
28+
def task_delayer(func_to_delay, queue_name, delay_seconds=None,
29+
override=False):
2830
function_path = function_to_import_path(func_to_delay, override=override)
2931

3032
if not queue_name:
@@ -55,7 +57,8 @@ def wrapper(*args, **kwargs):
5557

5658

5759
class task(object):
58-
def __init__(self, queue=None, delay_seconds=None, custom_function_path=None):
60+
def __init__(self, queue=None, delay_seconds=None,
61+
custom_function_path=None):
5962
self.queue_name = queue
6063
self.delay_seconds = delay_seconds
6164
self.function_path = custom_function_path
@@ -67,5 +70,6 @@ def __call__(self, *args, **kwargs):
6770
if self.function_path:
6871
override = True
6972
function = self.function_path
70-
func_to_wrap.delay = task_delayer(function, self.queue_name, self.delay_seconds, override=override)
73+
func_to_wrap.delay = task_delayer(
74+
function, self.queue_name, self.delay_seconds, override=override)
7175
return func_to_wrap

pyqs/main.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ def main():
4141
dest="logging_level",
4242
type=str,
4343
default="WARN",
44-
help='Set logging level. This must be one of the python default logging levels',
44+
help=(
45+
'Set logging level. '
46+
'This must be one of the python default logging levels'
47+
),
4548
action="store",
4649
)
4750

@@ -95,7 +98,10 @@ def main():
9598
dest="prefetch_multiplier",
9699
type=int,
97100
default=2,
98-
help='Multiplier on the size of the internal queue for prefetching SQS messages.',
101+
help=(
102+
'Multiplier on the size of the internal queue '
103+
'for prefetching SQS messages.'
104+
),
99105
action="store",
100106
)
101107

@@ -114,9 +120,18 @@ def main():
114120
)
115121

116122

117-
def _main(queue_prefixes, concurrency=5, logging_level="WARN", region='us-east-1', access_key_id=None, secret_access_key=None, interval=1, batchsize=10, prefetch_multiplier=2):
118-
logging.basicConfig(format="[%(levelname)s]: %(message)s", level=getattr(logging, logging_level))
123+
def _main(queue_prefixes, concurrency=5, logging_level="WARN",
124+
region='us-east-1', access_key_id=None, secret_access_key=None,
125+
interval=1, batchsize=10, prefetch_multiplier=2):
126+
logging.basicConfig(
127+
format="[%(levelname)s]: %(message)s",
128+
level=getattr(logging, logging_level),
129+
)
119130
logger.info("Starting PyQS version {}".format(__version__))
120-
manager = ManagerWorker(queue_prefixes, concurrency, interval, batchsize, prefetch_multiplier=prefetch_multiplier, region=region, access_key_id=access_key_id, secret_access_key=secret_access_key)
131+
manager = ManagerWorker(
132+
queue_prefixes, concurrency, interval, batchsize,
133+
prefetch_multiplier=prefetch_multiplier, region=region,
134+
access_key_id=access_key_id, secret_access_key=secret_access_key,
135+
)
121136
manager.start()
122137
manager.sleep()

0 commit comments

Comments
 (0)