MouseTools 4.4.0__tar.gz → 4.4.2__tar.gz

{mousetools-4.4.0 → mousetools-4.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.4.0
+Version: 4.4.2
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -17,9 +17,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.27.2
 Requires-Dist: pycryptodome>=3.22.0
 Requires-Dist: python-dateutil>=2.9.0.post0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: tzdata>=2025.2
 Dynamic: license-file
 

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools/auth.py

@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
 from importlib.resources import as_file, files
 from typing import Optional
 
-import httpx
+import requests
 from Crypto.Cipher import AES
 
 logger = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ class Authentication:
         }
 
         logger.debug("Sending request for authentication token")
-        response = httpx.post(
+        response = requests.post(
             f"{self._environments['authzServiceUrl']}/token",
             headers=headers,
             params=body,

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools/channels/__init__.py

@@ -79,7 +79,7 @@ class CouchbaseChannel(CouchbaseMixin):
         )
 
         self._cb_data = None
-        self._refresh_interval = timedelta(minutes=10)
+        self._refresh_interval = timedelta(hours=12)
         self._cb_data_pull_time = datetime.now(tz=self._tz.value)
 
         if not lazy_load:

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools/channels/facilities/__init__.py

@@ -4,7 +4,7 @@ from datetime import datetime, time, timedelta
 from typing import Any, Optional
 from zoneinfo import ZoneInfo
 
-import httpx
+import requests
 
 from mousetools.api.menu import Menus
 from mousetools.channels import CouchbaseChannel, CouchbaseChildChannel
@@ -503,11 +503,11 @@ class FacilityChildChannel(CouchbaseChildChannel):
             "appid": weather_key,
         }
         try:
-            response = httpx.get(weather_url, params=params)
+            response = requests.get(weather_url, params=params, timeout=10)
             response.raise_for_status()
             data = response.json()
             return data
-        except httpx.HTTPError as err:
+        except requests.HTTPError as err:
             logger.error("Request failed: %s", err)
             return {}
 
@@ -532,7 +532,7 @@ DiningEventFacilityChild = type("DiningEventFacilityChild", (FacilityChildChanne
 DinnerShowFacilityChild = type("DinnerShowFacilityChild", (FacilityChildChannel,), {})
 EntertainmentFacilityChild = type("EntertainmentFacilityChild", (FacilityChildChannel,), {})
 EntertainmentVenueFacilityChild = type("EntertainmentVenueFacilityChild", (FacilityChildChannel,), {})
-WaterParkFacilityChild = type("WaterParkFacilityChild", (FacilityChildChannel,), {})
+EventFacilityChild = type("EventFacilityChild", (FacilityChildChannel,), {})
 GuestServiceFacilityChild = type("GuestServiceFacilityChild", (FacilityChildChannel,), {})
 LandFacilityChild = type("LandFacilityChild", (FacilityChildChannel,), {})
 MerchandiseFacilityChild = type("MerchandiseFacilityChild", (FacilityChildChannel,), {})
@@ -546,8 +546,8 @@ SpaFacilityChild = type("SpaFacilityChild", (FacilityChildChannel,), {})
 ThemeParkFacilityChild = type("ThemeParkFacilityChild", (FacilityChildChannel,), {})
 TourFacilityChild = type("TourFacilityChild", (FacilityChildChannel,), {})
 TransportationFacilityChild = type("TransportationFacilityChild", (FacilityChildChannel,), {})
-WaterParkFacilityChild = type("WaterParkFacilityChild", (FacilityChildChannel,), {})
 RestaurantFacilityChild = type("RestaurantFacilityChild", (FacilityChildChannel,), {})
+WaterParkFacilityChild = type("WaterParkFacilityChild", (FacilityChildChannel,), {})
 
 
 class FacilityChannel(CouchbaseChannel):
@@ -631,13 +631,13 @@ class FacilityChannel(CouchbaseChannel):
         """
         return self._get_children_objects_helper(EntertainmentFacilityChild, EntityType.ENTERTAINMENT)
 
-    def get_children_events(self) -> list[WaterParkFacilityChild]:  # type: ignore
-        """Get WaterParkFacilityChild Children of a Facility
+    def get_children_events(self) -> list[EventFacilityChild]:  # type: ignore
+        """Get EventFacilityChild Children of a Facility
 
         Returns:
-            (list[WaterParkFacilityChild]): A list of WaterParkFacilityChild Children
+            (list[EventFacilityChild]): A list of EventFacilityChild Children
         """
-        return self._get_children_objects_helper(WaterParkFacilityChild, EntityType.EVENT)
+        return self._get_children_objects_helper(EventFacilityChild, EntityType.EVENT)
 
     def get_children_entertainment_venues(self) -> list[EntertainmentVenueFacilityChild]:  # type: ignore
         """Get EntertainmentVenueFacilityChild Children of a Facility

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools/mixins/couchbase.py

@@ -3,7 +3,7 @@ import logging
 import re
 from typing import Union
 
-import httpx
+import requests
 
 from mousetools.auth import auth_obj
 
@@ -33,7 +33,7 @@ class CouchbaseMixin:
         }
 
         logger.info("Sending request for channel data: %s", channel_name)
-        response = httpx.post(self._couchbase_url + "/_bulk_get", json=payload, headers=self._headers)
+        response = requests.post(self._couchbase_url + "/_bulk_get", json=payload, headers=self._headers, timeout=10)
         logger.debug("Response status for %s: %s", channel_name, response.status_code)
         data = None
         try:
@@ -51,7 +51,7 @@ class CouchbaseMixin:
                     except Exception:
                         logger.debug("Failed to parse line: %s", line)
                         continue
-        except httpx.HTTPError as err:
+        except requests.HTTPError as err:
             logger.error("Request failed: %s", err)
             return None
 
@@ -79,10 +79,11 @@ class CouchbaseMixin:
                 payload["since"] = since
 
             logger.info("Sending request for channel changes: %s", channel_name)
-            response = httpx.post(self._couchbase_url + "/_changes", json=payload, headers=self._headers)
+            response = requests.post(self._couchbase_url + "/_changes", json=payload, headers=self._headers, timeout=10)
             logger.debug("Response status for %s: %s", channel_name, response.status_code)
-            data = response.raise_for_status().json()
-        except httpx.HTTPError as err:
+            response.raise_for_status()
+            data = response.json()
+        except requests.HTTPError as err:
             logger.error("Request failed: %s", err)
             return None
 

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools/mixins/disney.py

@@ -2,7 +2,7 @@ import json
 import logging
 from typing import Union
 
-import httpx
+import requests
 
 from mousetools.auth import auth_obj
 
@@ -21,13 +21,13 @@ class DisneyAPIMixin:
             (Union[dict, None]): The disney data.
         """
         logger.info("Sending request to %s", url)
-        response = httpx.get(url, headers=auth_obj.get_headers())
+        response = requests.get(url, headers=auth_obj.get_headers(), timeout=10)
         logger.debug("Response status: %s", response.status_code)
 
         try:
             response.raise_for_status()
             data = response.json()
-        except (httpx.HTTPError, json.decoder.JSONDecodeError) as err:
+        except (requests.HTTPError, json.decoder.JSONDecodeError) as err:
             logger.error("Request failed. Error: %s", err)
             return None
 

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mousetools
-Version: 4.4.0
+Version: 4.4.2
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 License-Expression: MIT
@@ -17,9 +17,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.27.2
 Requires-Dist: pycryptodome>=3.22.0
 Requires-Dist: python-dateutil>=2.9.0.post0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: tzdata>=2025.2
 Dynamic: license-file
 

{mousetools-4.4.0 → mousetools-4.4.2}/mousetools.egg-info/requires.txt

@@ -1,4 +1,4 @@
-httpx>=0.27.2
 pycryptodome>=3.22.0
 python-dateutil>=2.9.0.post0
+requests>=2.32.3
 tzdata>=2025.2

{mousetools-4.4.0 → mousetools-4.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mousetools"
-version = "4.4.0"
+version = "4.4.2"
 authors = [{name = "Scott Caratozzolo"}]
 description = "An unofficial Python wrapper for Disney's API"
 readme = "README.md"
@@ -8,9 +8,9 @@ license = "MIT"
 license-files = ["LICENSE"]
 requires-python = ">=3.9, <4.0"
 dependencies = [
-    "httpx>=0.27.2",
     "pycryptodome>=3.22.0",
     "python-dateutil>=2.9.0.post0",
+    "requests>=2.32.3",
     "tzdata>=2025.2",
 ]
 classifiers = [
@@ -42,7 +42,7 @@ dev-dependencies = [
     "go-task-bin>=3.43.3",
     "icecream>=2.1.4",
     "pytest-mock>=3.14.0",
-    "pytest-httpx>=0.35.0",
+    "responses>=0.25.7",
 ]
 
 [build-system]
@@ -105,17 +105,25 @@ select = [
     "D102", "D103", "D417",
     # pylint
     "PL",
+    # pep8-naming
+    "N",
+    # flake8-datetimez
+    "DTZ002", "DTZ003", "DTZ004", "DTZ011", "DTZ012",
+    # flake8-logging-format
+    "G",
+    # flake8-print
+    "T20",
 ]
 
 ignore = [
     # LineTooLong
     "E501",
-    # DoNotAssignLambda
-    "E731",
     # builtin-open
     "PTH123",
     # Magic value used in comparison
     "PLR2004",
+    # Logging statement uses %
+    "G002",
 ]
 
 [tool.ruff.lint.per-file-ignores]