python-openpublictransport 0.1.16__tar.gz → 0.1.17__tar.gz

{python_openpublictransport-0.1.16 → python_openpublictransport-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openpublictransport
-Version: 0.1.16
+Version: 0.1.17
 Summary: Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)
 License: MIT
 Requires-Python: >=3.11

{python_openpublictransport-0.1.16 → python_openpublictransport-0.1.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-openpublictransport"
-version = "0.1.16"
+version = "0.1.17"
 description = "Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)"
 readme = "README.md"
 license = { text = "MIT" }

{python_openpublictransport-0.1.16 → python_openpublictransport-0.1.17}/src/openpublictransport/providers/efa_base.py

@@ -154,7 +154,9 @@ class EFABaseProvider(BaseProvider):
                 async with self.session.get(url, headers=headers, timeout=aiohttp.ClientTimeout(total=10)) as response:
                     if response.status == 200:
                         try:
-                            json_data = await response.json()
+                            # content_type=None: some deployments (VGN) send RapidJSON
+                            # payloads with a "text/xml;;charset=utf-8" header (issue #79).
+                            json_data = await response.json(content_type=None)
                             if not isinstance(json_data, dict):
                                 _LOGGER.warning("%s API returned non-dict response: %s", name, type(json_data))
                                 return None
@@ -251,7 +253,9 @@ class EFABaseProvider(BaseProvider):
             async with self.session.get(url, timeout=aiohttp.ClientTimeout(total=10)) as response:
                 if response.status == 200:
                     try:
-                        data = await response.json()
+                        # content_type=None: some deployments (VGN) send RapidJSON
+                        # payloads with a "text/xml;;charset=utf-8" header (issue #79).
+                        data = await response.json(content_type=None)
                     except (ValueError, aiohttp.ContentTypeError) as e:
                         _LOGGER.error("Invalid JSON response from %s API: %s", name, e)
                         return []

{python_openpublictransport-0.1.16 → python_openpublictransport-0.1.17}/src/python_openpublictransport.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-openpublictransport
-Version: 0.1.16
+Version: 0.1.17
 Summary: Python library for public transport APIs (EFA, OTP2, TRIAS, FPTF, HAFAS, GTFS-RT)
 License: MIT
 Requires-Python: >=3.11

{python_openpublictransport-0.1.16 → python_openpublictransport-0.1.17}/src/python_openpublictransport.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ src/python_openpublictransport.egg-info/SOURCES.txt
 src/python_openpublictransport.egg-info/dependency_links.txt
 src/python_openpublictransport.egg-info/requires.txt
 src/python_openpublictransport.egg-info/top_level.txt
+tests/test_efa_mimetype.py
 tests/test_efa_platform.py
 tests/test_entur.py
 tests/test_hafas_base.py

python_openpublictransport-0.1.17/tests/test_efa_mimetype.py

@@ -0,0 +1,87 @@
+"""EFA endpoints that mislabel their JSON payload (issue #79).
+
+VGN answers ``outputFormat=RapidJSON`` requests with
+``Content-Type: text/xml;;charset=utf-8``. aiohttp raises ``ContentTypeError``
+for that unless the caller passes ``content_type=None``, so station search
+returned "no results found" even though the body was valid JSON.
+
+The fake response below mimics aiohttp: it raises unless the strict content
+type check is disabled — a mock that accepts the kwarg either way cannot catch
+this regression.
+"""
+
+import aiohttp
+import pytest
+
+from openpublictransport.providers.vgn import VGNProvider
+
+STOPFINDER_PAYLOAD = {
+    "locations": [
+        {
+            "id": "de:09564:704",
+            "name": "Nürnberg, Rathenauplatz",
+            "disassembledName": "Rathenauplatz, Nürnberg",
+            "type": "stop",
+        }
+    ]
+}
+
+DM_PAYLOAD = {
+    "stopEvents": [
+        {
+            "departureTimePlanned": "2026-08-08T10:00:00Z",
+            "transportation": {"number": "U2", "product": {"class": 2, "name": "U-Bahn"}},
+        }
+    ]
+}
+
+
+class _XmlMimeResponse:
+    """Response whose body is JSON but whose header claims text/xml."""
+
+    def __init__(self, payload, status=200):
+        self.status = status
+        self._payload = payload
+
+    async def json(self, content_type="application/json"):
+        if content_type is not None:
+            raise aiohttp.ContentTypeError(
+                None,
+                (),
+                message=("Attempt to decode JSON with unexpected mimetype: text/xml;;charset=utf-8"),
+            )
+        return self._payload
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, *exc):
+        return False
+
+
+class _FakeSession:
+    def __init__(self, payload):
+        self._payload = payload
+        self.urls = []
+
+    def get(self, url, headers=None, timeout=None):
+        self.urls.append(url)
+        return _XmlMimeResponse(self._payload)
+
+
+@pytest.mark.asyncio
+async def test_search_stops_accepts_xml_mimetype():
+    session = _FakeSession(STOPFINDER_PAYLOAD)
+    results = await VGNProvider(session).search_stops("Rathenauplatz, Nürnberg")
+
+    assert [r["id"] for r in results] == ["de:09564:704"]
+    assert results[0]["place"] == "Nürnberg"
+
+
+@pytest.mark.asyncio
+async def test_fetch_departures_accepts_xml_mimetype():
+    session = _FakeSession(DM_PAYLOAD)
+    data = await VGNProvider(session).fetch_departures("de:09564:704", "", "", 10)
+
+    assert data is not None
+    assert len(data["stopEvents"]) == 1