Skip to content

Commit 8411aa1

Browse files
Update parser.py
1 parent b539206 commit 8411aa1

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

parser.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77

88
Fieldstuple = namedtuple('Fields', 'varieties custumers numbers pieces \
9-
totals prices amounts codes \
10-
\
11-
codes_singleUse rates_singleUse\
12-
codes_multiUse deposits_multiUse, rents_multiUse')
9+
totals prices amounts codes \ \
10+
codes_singleUse rates_singleUse\
11+
codes_multiUse deposits_multiUse, rents_multiUse')
1312

1413

1514
def find_main_data(book, sheet:str):
@@ -132,7 +131,7 @@ def find_quantities_multiUse(book, sheet:str, multiUse_range):
132131
raise ValueError(f"couldn't find headline_row of 'Multi use packaging' on {sheet}")
133132

134133
quantity_columns = [cell.column for cell in page[headline_row]
135-
if cell.value in ('Number', 'Deposit', 'Packaging\nrental charge', 'Packaging')]
134+
if cell.value in ('Number', 'Deposit', 'Packaging\nrental charge', 'Packaging')]
136135
if not len(quantity_columns) == 3:
137136
raise ValueError(f"couldn't find one of: 'Number', 'Deposit' or 'Packaging rental charge' columns in 'Multi use packaging'-section on {sheet}")
138137
return tuple(get_column_letter(i) for i in quantity_columns)
@@ -156,7 +155,7 @@ def get_range_from_column(book, sheet:str, col_range:tuple, column_name:str):
156155
"""
157156
page = book.get_sheet_by_name(sheet)
158157
return [i[0].value for i in
159-
page[f'{column_name}{col_range[0]}':f'{column_name}{col_range[1]}']]
158+
page[f'{column_name}{col_range[0]}':f'{column_name}{col_range[1]}']]
160159

161160

162161
def is_longFormat_date(date:str):
@@ -224,16 +223,14 @@ def check_fractinalStrings(values:list, sheet, column_name):
224223

225224
def correct_priece_format(price:str, book, sheet:str):
226225
if not isinstance(price, int):
227-
raise ValueError(f'error while convert to right format value {price}\
228-
from column Prise on page "{sheet}"')
226+
raise ValueError(f'error while convert to right format value {price} from column Prise on page "{sheet}"')
229227
price = str(price)
230228
if len(price) == 3:
231229
return float(f'0.{price}')
232230
elif len(price) > 3:
233231
return float(f'{price[:-3]}.{price[-3:]}')
234232
else:
235-
raise ValueError(f'ValueError: while convert to right format value {price}\
236-
from column Prise on page {sheet}')
233+
raise ValueError(f'ValueError: while convert to right format value {price} from column Prise on page {sheet}')
237234

238235

239236
def correct_totals_format(totals:list):
@@ -257,7 +254,7 @@ def adopt_float_format(rate_value):
257254
return float(result)
258255

259256

260-
# retrieve_...()s used in parse()' function
257+
# retrieve_...() functions used in parse()' function
261258

262259
def retrieve_variety(book, sheet, data_range):
263260
retrieved = get_range_from_column(book, sheet, data_range, 'C')
@@ -408,10 +405,10 @@ def parse(file):
408405
rents_multiUse += rent_multiUse
409406

410407
return Fieldstuple(varieties, custumers, numbers, pieces,
411-
totals, prices, amounts, codes,
412-
codes_singleUse, rates_singleUse,
413-
codes_multiUse, deposits_multiUse, rents_multiUse)
408+
totals, prices, amounts, codes,
409+
codes_singleUse, rates_singleUse,
410+
codes_multiUse, deposits_multiUse, rents_multiUse)
414411

415412

416413
if __name__ == '__main__':
417-
pass
414+
pass

0 commit comments

Comments
 (0)