uk_bin_collection 0.135.1__py3-none-any.whl → 0.135.3__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -2202,12 +2202,11 @@
         "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WyreCouncil": {
-        "postcode": "FY6 8HG",
         "skip_get_url": true,
         "uprn": "10003519994",
         "url": "https://www.wyre.gov.uk/bins-rubbish-recycling",
         "wiki_name": "Wyre Council",
-        "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search). The postcode should be wrapped in double quotes with a space in the middle."
+        "wiki_note": "Provide your UPRN. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WyreForestDistrictCouncil": {
         "house_number": "Monday",

uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py

@@ -1,22 +1,19 @@
+from datetime import datetime
+
+import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
 class CouncilClass(AbstractGetBinDataClass):
-    """
-    Concrete classes have to implement all abstract operations of the
-    base class. They can also override some operations with a default
-    implementation.
-    """
-
     def parse_data(self, page: str, **kwargs) -> dict:
         uprn = kwargs.get("uprn")
         check_uprn(uprn)
 
         # Figure bin data URL from UPRN
         url = "https://www.northyorks.gov.uk/bin-calendar/lookup"
-
         payload = {
             "selected_address": uprn,
             "submit": "Continue",
@@ -42,17 +39,22 @@ class CouncilClass(AbstractGetBinDataClass):
         rows = table.find_all("tr")
 
         data = {"bins": []}
+
         for row in rows:
             cols = row.find_all("td")
             # First column is date
             bin_date = datetime.strptime(cols[0].text.strip(), "%d %B %Y")
-            # Third column is type
-            bin_type = cols[2].text.strip()
-            # This bin
-            this_bin = {
-                "type": bin_type,
-                "collectionDate": bin_date.strftime(date_format),
-            }
-            data["bins"].append(this_bin)
+
+            # Third column may contain multiple bin types separated by line breaks
+            # .stripped_strings yields a generator over all non-whitespace text segments
+            bin_types = [txt for txt in cols[2].stripped_strings]
+
+            for sub_bin in bin_types:
+                data["bins"].append(
+                    {
+                        "type": sub_bin,
+                        "collectionDate": bin_date.strftime(date_format),
+                    }
+                )
 
         return data

uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py

@@ -19,9 +19,6 @@ class CouncilClass(AbstractGetBinDataClass):
         user_uprn = kwargs.get("uprn")
         check_uprn(user_uprn)
 
-        user_postcode = kwargs.get("postcode")
-        check_postcode(user_postcode)
-
         data = {"bins": []}
         collections = []
 
@@ -41,17 +38,8 @@ class CouncilClass(AbstractGetBinDataClass):
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.6167.186 Safari/537.36",
             "x-requested-with": "XMLHttpRequest",
         }
-        postcode_api = f"https://www.wyre.gov.uk/singlepoint_ajax/{urllib.parse.quote(user_postcode)}"
-        addr_res = requests.post(postcode_api, headers=headers)
-        json_data = addr_res.json()
-
-        for v in json_data.values():
-            v_uprn = v.get("uprn")
-            if v_uprn == user_uprn:
-                addr_line = v.get("label")
-                break
 
-        api_url = f"https://www.wyre.gov.uk/bincollections?uprn={user_uprn}&address={urllib.parse.quote(addr_line)}&submit="
+        api_url = f"https://www.wyre.gov.uk/bincollections?uprn={user_uprn}"
         res = requests.get(api_url, headers=headers)
 
         soup = BeautifulSoup(res.text, features="html.parser")

{uk_bin_collection-0.135.1.dist-info → uk_bin_collection-0.135.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.135.1
+Version: 0.135.3
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.135.1.dist-info → uk_bin_collection-0.135.3.dist-info}/RECORD

@@ -3,7 +3,7 @@ uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=Iecdja0I3XIiY
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=YgUI7DkX6n4vwsFvYEmHwkS3yn6Td5QZWFAva8Bj5PY,116367
+uk_bin_collection/tests/input.json,sha256=1WxEeiVgfEgwPt9QE7-fHgW3itmi4SiMJ6DzzXnmq5U,116247
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -200,7 +200,7 @@ uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py,sha
 uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py,sha256=EbFVnPYZIOkru5_Y75kjljM3Cr3HIJgP-SU6hxgf6tk,2754
 uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py,sha256=MHfcSrfWBIiWwVnhOqUrOkr0Ahguu_oU4pHrv_vSa-Y,5929
 uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py,sha256=gJj0dyQc5QUefqusKGk2LLXfWbG5tlEXUOh8KAPh3RI,4584
-uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py,sha256=2wTrr3VrZDp9-YtDPmWd649gXeWH4hbm2-Hw8Vau5Xs,1933
+uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py,sha256=rwW6y5yhRiuYk3lVS7YFZxLaY_yfojdcn2dxiWaP4YA,2013
 uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py,sha256=CF9__v8xOUJ9Ukic9Yg9WnVUojV3Cv6_dHAHJzL6V3o,5106
 uk_bin_collection/uk_bin_collection/councils/NorwichCityCouncil.py,sha256=6w5-xKiyxTlJLaCkwUnAWjd5jnohonnNRr0sTlfACvk,2702
 uk_bin_collection/uk_bin_collection/councils/NottinghamCityCouncil.py,sha256=panTCjnsBOQ98-TBO9xVZk_jcT_gjMhx3Gg5oWxBRLo,1254
@@ -309,14 +309,14 @@ uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H
 uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py,sha256=ncXfu5RHPCFsArczXHy7g0l_HEZa7GC-QA1QRReP_00,1801
 uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py,sha256=dKHB2fPSmOGOwyvfpbdR4U8XW2ctBf63gCPxX06kwKA,1867
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=GnNNMe33YMlK6S7rjM3c4BQkBnXelS0DKl2x5V4fb2w,5775
-uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
+uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=QpCkmRSQmJo0RLsjXoCYPDcoxuDzG_00qNV0AHTDmXo,3000
 uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py,sha256=3b7WzBXdYub6j13sqDL3jlqgICKmNyQaF4KxRxOMHWk,2000
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.135.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.135.1.dist-info/METADATA,sha256=qeUmV9kdAQjWn7zNc6f6aWfwb1OXI33ZJkv0QVYuykU,19741
-uk_bin_collection-0.135.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.135.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.135.1.dist-info/RECORD,,
+uk_bin_collection-0.135.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.135.3.dist-info/METADATA,sha256=hmaNZDf9gPgRkIP7dLin2bsLgIGoGEej5w-VieP-53Q,19741
+uk_bin_collection-0.135.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.135.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.135.3.dist-info/RECORD,,