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
jcbashdown committed Apr 22, 2014
1 parent edf7a59 commit adb36a6
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 50 deletions.
4 changes: 3 additions & 1 deletion backdrop/admin/app.py
View file
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
View file
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
View file
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
View file
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
20 changes: 10 additions & 10 deletions tests/core/test_data_set.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def setUp(self):
self.mock_repository = mock_repository()
self.mock_database = mock_database(self.mock_repository)
self.data_set = data_set.DataSet(self.mock_database, DataSetConfig('test_data_set',
data_group="group",
data_type="type"))
data_group="group",
data_type="type"))

def test_that_a_single_object_gets_stored(self):
obj = Record({"name": "Gummo"})
Expand Down Expand Up @@ -230,10 +230,10 @@ def test_period_query_adds_missing_periods_in_correct_order(self):
]

result = self.data_set.query(Query.create(period=WEEK,
start_at=d_tz(2013, 1, 7, 0, 0,
0),
end_at=d_tz(2013, 2, 18, 0, 0,
0)))
start_at=d_tz(2013, 1, 7, 0, 0,
0),
end_at=d_tz(2013, 2, 18, 0, 0,
0)))

assert_that(result.data(), contains(
has_entries({"_start_at": d_tz(2013, 1, 7), "_count": 0}),
Expand Down Expand Up @@ -355,7 +355,7 @@ def test_month_and_group_query(self):
]

query_result = self.data_set.query(Query.create(period=MONTH,
group_by="some_group"))
group_by="some_group"))
data = query_result.data()
assert_that(data,
has_item(has_entries({"values": has_length(2)})))
Expand Down Expand Up @@ -401,9 +401,9 @@ def test_month_and_group_query_with_start_and_end_at(self):
]

query_result = self.data_set.query(Query.create(period=MONTH,
group_by="some_group",
start_at=d(2013, 1, 1),
end_at=d(2013, 4, 2)))
group_by="some_group",
start_at=d(2013, 1, 1),
end_at=d(2013, 4, 2)))
data = query_result.data()
assert_that(data,
has_item(has_entries({"values": has_length(4)})))
Expand Down
44 changes: 22 additions & 22 deletions tests/core/test_repository.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ def test_retrieve_correctly_decodes_stagecraft_response(self):
data_set = self.data_set_repo.retrieve(name="data_set_name")

expected_data_set = DataSetConfig("govuk_visitors",
data_group="govuk",
data_type="visitors",
raw_queries_allowed=True,
bearer_token="my-bearer-token",
upload_format="excel",
upload_filters="",
auto_ids="",
queryable=True,
realtime=False,
capped_size=None,
max_age_expected=86400)
data_group="govuk",
data_type="visitors",
raw_queries_allowed=True,
bearer_token="my-bearer-token",
upload_format="excel",
upload_filters="",
auto_ids="",
queryable=True,
realtime=False,
capped_size=None,
max_age_expected=86400)

assert_that(data_set, equal_to(expected_data_set))

Expand Down Expand Up @@ -99,17 +99,17 @@ def test_get_data_set_for_query_correctly_decodes_stagecraft_response(self):
data_group="govuk", data_type="realtime")

expected_data_set = DataSetConfig("govuk_visitors",
data_group="govuk",
data_type="visitors",
raw_queries_allowed=True,
bearer_token="my-bearer-token",
upload_format="excel",
upload_filters="",
auto_ids="",
queryable=True,
realtime=False,
capped_size=None,
max_age_expected=86400)
data_group="govuk",
data_type="visitors",
raw_queries_allowed=True,
bearer_token="my-bearer-token",
upload_format="excel",
upload_filters="",
auto_ids="",
queryable=True,
realtime=False,
capped_size=None,
max_age_expected=86400)

assert_that(data_set, equal_to(expected_data_set))

Expand Down
2 changes: 1 addition & 1 deletion tests/support/data_set.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def query_side_effect(data_group, data_type):


def fake_data_set_exists(name, data_group="group", data_type="type",
*data_set_args, **data_set_kwargs):
*data_set_args, **data_set_kwargs):
setup_data_set_name = name

def decorator(func):
Expand Down
3 changes: 2 additions & 1 deletion tools/create_seed.py
View file
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 adb36a6

Please sign in to comment.