Skip to content
Snippets Groups Projects

WIP: #45 - WTO: Write datasets in JSON repo for "annually" category

Closed Bruno Duyé requested to merge dev into master
All threads resolved!
1 file
+ 4
4
Compare changes
  • Side-by-side
  • Inline
+ 4
4
@@ -262,7 +262,7 @@ def create_directories_subtree(category_or_dataset, parent_category_path):
elif element['type'] == 'dataset':
create_dataset_and_series(element, element_path)
else:
raise "Unexpted type: {}".format(element['type'])
raise "Unexpected type: {}".format(element['type'])
def create_dataset_and_series(dataset, parent_category_path):
@@ -281,7 +281,7 @@ def create_dataset_and_series(dataset, parent_category_path):
elif filename.endswith('.xls'):
create_dataset_and_series_from_xls(dataset, dataset_path)
else:
raise ValueError("Unexepted file format: {} for dataset \"{}\"".format(filename, dataset['name']))
raise ValueError("Unexpected file format: {} for dataset \"{}\"".format(filename, dataset['name']))
def create_dataset_and_series_from_csv(dataset, dataset_path):
@@ -450,10 +450,10 @@ def create_dataset_and_series_from_xls(dataset, dataset_path):
# Ensure all elements match regexp and there's no "holes"
for col_num, value in enumerate(periods_row):
row_coords = (row_num, first_non_empty_cell_col_number + col_num) # coords in file
assert value, "Unexepted empty cell at position {} ({}) in {} sheet".format(
assert value, "Unexpected empty cell at position {} ({}) in {} sheet".format(
row_coords, xlrd.cellname(*row_coords), sheet.name)
assert re.match(period_regexp, value), \
"Unexepted period \"{}\" at position {} ({}) in {} sheet".format(
"Unexpected period \"{}\" at position {} ({}) in {} sheet".format(
value, row_coords, xlrd.cellname(*row_coords), sheet.name)
return first_non_empty_cell_col_number, periods_row