chellow 1753182209.0.0__py3-none-any.whl → 1753430805.0.0__py3-none-any.whl

chellow/e/dno_rate_parser.py

@@ -54,7 +54,7 @@ def get_rate(row, idx):
         return None
 
     val = cell.value
-    if val is None:
+    if val in (None, "-"):
         return None
     elif isinstance(val, str) and len(val) == 0:
         return None
@@ -318,10 +318,11 @@ def tab_ehv(sheet, gsp_rates):
                         band = 0
                     else:
                         band_val = get_value(row, band_col)
-                        if band_val is None:
+                        if band_val in (None, ""):
                             band = 0
                         else:
                             band = int(band_val)
+
                     tariffs[llfc] = {
                         "super-red-gbp-per-kwh": get_rate(
                             row, col_match(title_row, f"{polarity} super red")
@@ -425,19 +426,27 @@ def find_rates(file_name, file_like):
 
 
 GSP_MAP = (
+    ("eastern-power-networks-", "_A"),
     ("gsp a", "_A"),
     ("gsp b", "_B"),
     ("gsp c", "_C"),
+    ("lond", "_C"),
     ("gsp d", "_D"),
+    ("spm-", "_D"),
     ("gsp e", "_E"),
+    ("mide", "_E"),
     ("gsp f", "_F"),
+    ("enwl-", "_G"),
     ("gsp g", "_G"),
     ("gsp h", "_H"),
+    ("sepd", "_H"),
     ("gsp j", "_J"),
     ("gsp k", "_K"),
     ("gsp l", "_L"),
+    ("sweb", "_L"),
     ("gsp m", "_M"),
     ("gsp n", "_N"),
+    ("spd", "_N"),
     ("gsp p", "_P"),
     ("gsp_a", "_A"),
     ("gsp_b", "_B"),
@@ -453,10 +462,6 @@ GSP_MAP = (
     ("gsp_m", "_M"),
     ("gsp_n", "_N"),
     ("gsp_p", "_P"),
-    ("lond", "_C"),
-    ("mide", "_E"),
-    ("sepd", "_H"),
-    ("sweb", "_L"),
 )
 
 

{chellow-1753182209.0.0.dist-info → chellow-1753430805.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753182209.0.0
+Version: 1753430805.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

{chellow-1753182209.0.0.dist-info → chellow-1753430805.0.0.dist-info}/RECORD

@@ -22,7 +22,7 @@ chellow/e/bsuos.py,sha256=2L7pgiGbV4k1Udfzjj4B2Qye02sV_FhNjwh7_sIxXFg,15525
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
 chellow/e/computer.py,sha256=lt4Zlr8EOClL1acuuvKA-tNPCI5RRHnAZbsaGQnB9j4,68835
-chellow/e/dno_rate_parser.py,sha256=NOVfS9HRDsc0rO282hU-IdrcuvMlC7VE8RySqd_5eT0,21762
+chellow/e/dno_rate_parser.py,sha256=EO3uIYD0uiT8uumI5wnODMsFwYGrdB5HexuOu-2aFkw,21875
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=eOmX_wpxj6Ty6eaEgGAgXX-MgyJkYQSAT6DtJeP1rUE,5544
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
@@ -385,6 +385,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1753182209.0.0.dist-info/METADATA,sha256=7anKRCEEZQ42bSqtEd4uozS1hdVluvK83SWQvDymD1M,12585
-chellow-1753182209.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1753182209.0.0.dist-info/RECORD,,
+chellow-1753430805.0.0.dist-info/METADATA,sha256=KXvypCtSqk4Y6tVncDUkiwbGwJWf_adeA98upSyLz1g,12585
+chellow-1753430805.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1753430805.0.0.dist-info/RECORD,,