Skip to content
This repository has been archived by the owner on Mar 24, 2021. It is now read-only.

Commit

Permalink
pep8 fixes
Browse files Browse the repository at this point in the history
tests passing
  • Loading branch information
jcbashdown committed Apr 22, 2014
1 parent edf7a59 commit 3fe517a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 17 deletions.
4 changes: 3 additions & 1 deletion backdrop/admin/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def exception_handler(e):
code = getattr(e, 'code', 500)
name = getattr(e, 'name', 'Internal Error')

return render_template("error.html", name=name, data_set_name=data_set_name), \
return render_template("error.html",
name=name,
data_set_name=data_set_name), \
code


Expand Down
12 changes: 6 additions & 6 deletions backdrop/core/data_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ def __new__(cls, name, data_group, data_type, raw_queries_allowed=False,
"backdrop.core.upload.filters.first_sheet_filter"]

return super(DataSetConfig, cls).__new__(cls, name, data_group,
data_type,
raw_queries_allowed,
bearer_token, upload_format,
upload_filters, auto_ids,
queryable, realtime,
capped_size, max_age_expected)
data_type,
raw_queries_allowed,
bearer_token, upload_format,
upload_filters, auto_ids,
queryable, realtime,
capped_size, max_age_expected)

@property
def max_age(self):
Expand Down
9 changes: 6 additions & 3 deletions backdrop/read/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,14 @@ def data_set_health():

if len(failing_data_sets):
message = _data_set_message(failing_data_sets)
buck_string = ((len(failing_data_sets) > 1) and 'data_sets' or 'data_set')
if len(failing_data_sets) > 1:
data_set_string = 'data_sets'
else:
data_set_string = 'data_set'

return jsonify(status='error',
message='%s %s are out of date' %
(message, buck_string)), 500
(message, data_set_string)), 500

else:
return jsonify(status='ok',
Expand All @@ -118,7 +121,7 @@ def log_error_and_respond(data_set, message, status_code):
@app.route('/data/<data_group>/<data_type>', methods=['GET', 'OPTIONS'])
def data(data_group, data_type):
data_set_config = data_set_repository.get_data_set_for_query(data_group,
data_type)
data_type)
return fetch(data_set_config)


Expand Down
12 changes: 6 additions & 6 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ def get_database():

@task
def create_data_set(name, datagroup, datatype, rawqueries=False, token=None,
autoids=None, uploadformat=None, uploadfilters=None,
queryable=True, realtime=False):
autoids=None, uploadformat=None, uploadfilters=None,
queryable=True, realtime=False):
"""Create a new data_set configuration in the database."""
db = get_database()

config = DataSetConfig(name=name, data_group=datagroup, data_type=datatype,
raw_queries_allowed=rawqueries, bearer_token=token,
upload_format=uploadformat,
upload_filters=uploadfilters, auto_ids=autoids,
queryable=queryable, realtime=realtime)
raw_queries_allowed=rawqueries, bearer_token=token,
upload_format=uploadformat,
upload_filters=uploadfilters, auto_ids=autoids,
queryable=queryable, realtime=realtime)
repository = DataSetConfigRepository(db)

repository.save(config)
Expand Down
3 changes: 2 additions & 1 deletion tools/create_seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ def extract_data_sets(environment, read_config, write_config, nginx_config):
data_sets = disable_data_sets_by_match("test", data_sets)
data_sets = disable_data_sets_by_match("hmrc_preview", data_sets)

if is_production_like(environment) and not run_tests(environment, data_sets):
if is_production_like(environment) and not run_tests(environment,
data_sets):
sys.exit(1)

return data_sets
Expand Down

0 comments on commit 3fe517a

Please sign in to comment.