Fix ILO entry point url and default parameters

doc/sources.rst

@@ -143,7 +143,7 @@ SDMX-ML —
 -------------------
 
 SDMX-ML —
-`Website <http://ec.europa.eu/eurostat/web/sdmx-web-services/rest-sdmx-2.1>`__
+`Website <https://ec.europa.eu/eurostat/web/sdmx-web-services/rest-sdmx-2.1>`__
 
 - Thousands of dataflows on a wide range of topics.
 - No categorisations available.
@@ -170,17 +170,20 @@ SDMX-ML —
 ------------------------------------------
 
 SDMX-ML —
-`Website <www.ilo.org/ilostat/>`__
+`Website <https://ilostat.ilo.org/resources/sdmx-tools/>`__
+
+- :class:`sdmx.source.ilo.Source` handles some particularities of the ILO web service, including:
+
+  - The ``references=`` query parameter is not supported; any value is discarded with a warning.
 
-- :class:`sdmx.source.ilo.Source` handles some particularities of the ILO
-  web service. Others that are not handled:
+  Others that are not handled:
 
   - Data flow IDs take on the role of a filter.
     E.g., there are dataflows for individual countries, ages, sexes etc. rather than merely for different indicators.
   - The service returns 413 Payload Too Large errors for some queries, with messages like: "Too many results, please specify codelist ID".
     Test for :class:`sdmx.exceptions.HTTPError` (= :class:`requests.exceptions.HTTPError`) and/or specify a ``resource_id``.
 
-- It is highly recommended to read the `API guide <http://www.ilo.org/ilostat/content/conn/ILOSTATContentServer/path/Contribution%20Folders/statistics/web_pages/static_pages/technical_page/ilostat_appl/SDMX_User_Guide.pdf>`_.
+- It is highly recommended to read the “ILOSTAT SDMX User Guide” linked from the above webpage.
 
 .. autoclass:: sdmx.source.ilo.Source()
    :members:

doc/whatsnew.rst

@@ -11,6 +11,8 @@ What's new?
 Next release
 ============
 
+- Update :ref:`ILO` web service URL and quirks handling (:pull:`97`).
+- Use HTTPS for :ref:`ESTAT` (:pull:`97`).
 - Bump minimum version of :mod:`pydantic` to 1.9.2 (:pull:`98`).
 - Always return all objects parsed from a SDMX-ML :class:`.StructureMessage` (:pull:`99`).
 

sdmx/source/ilo.py

@@ -1,24 +1,27 @@
+import logging
+
 from . import Source as BaseSource
 
+log = logging.getLogger(__name__)
+
 
 class Source(BaseSource):
     _id = "ILO"
 
     def modify_request_args(self, kwargs):
-        """Handle two limitations of ILO's REST service.
+        """Handle limitations of ILO's REST service.
 
-        1. Service returns SDMX-ML 2.0 by default, whereas :mod:`sdmx` only
-           supports SDMX-ML 2.1. Set ``?format=generic_2_1`` query parameter.
-        2. The service does not support values 'parents', 'parentsandsiblings'
-           (the default), and 'all' for the ``references`` query parameter.
-           Override the default with ``?references=none``.
-
-           .. note:: Valid values are: none, parents, parentsandsiblings,
-              children, descendants, all, or a specific structure reference
-              such as 'codelist'.
+        1. Service returns SDMX-ML 2.0 by default, whereas :mod:`sdmx` only supports
+           SDMX-ML 2.1. Set ``?format=generic_2_1`` query parameter.
+        2. Service does not support the ``?references=…`` query parameter; discard.
         """
         super().modify_request_args(kwargs)
 
         kwargs.setdefault("params", {})
         kwargs["params"].setdefault("format", "generic_2_1")
-        kwargs["params"].setdefault("references", "none")
+
+        references = kwargs["params"].pop("references", None)
+        if references:
+            log.warning(
+                f"{self.id} does not support references={references!r}; discarded"
+            )

sdmx/sources.json

@@ -49,8 +49,8 @@
   },
   {
     "id": "ESTAT",
-    "documentation": "http://data.un.org/Host.aspx?Content=API",
-    "url": "http://ec.europa.eu/eurostat/SDMX/diss-web/rest",
+    "documentation": "https://ec.europa.eu/eurostat/web/sdmx-web-services/rest-sdmx-2.1",
+    "url": "https://ec.europa.eu/eurostat/SDMX/diss-web/rest",
     "name": "Eurostat",
     "supports": {
       "agencyscheme": false,
@@ -63,7 +63,7 @@
   {
     "id": "ILO",
     "name": "International Labor Organization",
-    "url": "http://www.ilo.org/ilostat/sdmx/ws/rest",
+    "url": "http://www.ilo.org/sdmx/rest",
     "headers": {
         "accept": "application/vnd.sdmx.structurespecificdata+xml;version=2.1"
     },

sdmx/tests/test_sources.py

@@ -229,6 +229,11 @@ def test_codelist(self, cache_path, client):
             "codelist", "CL_ECO", tofile=cache_path.with_suffix("." + "codelist-CL_ECO")
         )
 
+    @pytest.mark.network
+    def test_gh_96(self, caplog, cache_path, client):
+        client.get("codelist", "CL_ECO", params=dict(references="parentsandsiblings"))
+        assert "ILO does not support references = parentsandsiblings; discarded"
+
 
 class TestINEGI(DataSourceTest):
     source_id = "INEGI"