Fix entrypoint path building

Author: sdelquin

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Versions follow [Semantic Versioning](https://semver.org/) (`<major>.<minor>.<patch>`).
 
+## Unreleased
+
+Released XXXX-XX-XX
+
+- Fix entrypoint path building.
+
 ## Version 0.6.4
 
 Released 2021-04-08

istacpy/indicators/indicators.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'indicators'
@@ -63,7 +61,7 @@ def get_indicators_code(indicatorcode):
         >>> get_indicators_code("AFILIACIONES")
         >>> get_indicators_code("PARO_REGISTRADO")
     """
-    path = os.path.join('indicators', indicatorcode)
+    path = '/'.join(['indicators', indicatorcode])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -88,7 +86,7 @@ def get_indicators_code_data(indicatorcode, representation='', granularity='', f
     Examples:
         >>> get_indicators_code_data("AFILIACIONES")
     """
-    path = os.path.join('indicators', indicatorcode, 'data')
+    path = '/'.join(['indicators', indicatorcode, 'data'])
     url = services.build_entrypoint_url(
         API, path, representation=representation, granularity=granularity, fields=fields
     )

istacpy/indicators/systems.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'indicators'
@@ -44,7 +42,7 @@ def get_indicators_systems_code(indicatorsystemcode):
     Examples:
         >>> get_indicators_systems_code("C00075H")
     """
-    path = os.path.join('indicatorsSystems', indicatorsystemcode)
+    path = '/'.join(['indicatorsSystems', indicatorsystemcode])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -90,7 +88,7 @@ def get_indicators_systems_code_instances(
         ...     q='id EQ "INDICADORES_MUNICIPALES"'
         ... )
     """
-    path = os.path.join('indicatorsSystems', indicatorsystemcode, 'indicatorsInstances')
+    path = '/'.join(['indicatorsSystems', indicatorsystemcode, 'indicatorsInstances'])
     url = services.build_entrypoint_url(
         API,
         path,
@@ -121,11 +119,13 @@ def get_indicators_systems_code_instances_code(indicatorsystemcode, indicatorins
         ...     "21af0477-d63b-493b-ad02-4ab181547223"
         ... )
     """
-    path = os.path.join(
-        'indicatorsSystems',
-        indicatorsystemcode,
-        'indicatorsInstances',
-        indicatorinstancecode,
+    path = '/'.join(
+        [
+            'indicatorsSystems',
+            indicatorsystemcode,
+            'indicatorsInstances',
+            indicatorinstancecode,
+        ]
     )
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
@@ -159,12 +159,14 @@ def get_indicators_systems_code_instances_code_data(
         ...     "21af0477-d63b-493b-ad02-4ab181547223"
         ... )
     """
-    path = os.path.join(
-        'indicatorsSystems',
-        indicatorsystemcode,
-        'indicatorsInstances',
-        indicatorinstancecode,
-        'data',
+    path = '/'.join(
+        [
+            'indicatorsSystems',
+            indicatorsystemcode,
+            'indicatorsInstances',
+            indicatorinstancecode,
+            'data',
+        ]
     )
     url = services.build_entrypoint_url(
         API, path, representation=representation, granularity=granularity, fields=fields

istacpy/statisticalresources/cubes.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'statistical-resources'
@@ -48,7 +46,7 @@ def get_statisticalresources_datasets_agency(
     Examples:
         >>> get_statisticalresources_datasets_agency(agencyid="ISTAC")
     """
-    path = os.path.join('datasets', agencyid)
+    path = '/'.join(['datasets', agencyid])
     url = services.build_entrypoint_url(
         API, path, lang=lang, limit=limit, offset=offset, orderBy=orderby, query=query
     )
@@ -81,7 +79,7 @@ def get_statisticalresources_datasets_agency_resource(
         ... )
 
     """
-    path = os.path.join('datasets', agencyid, resourceid)
+    path = '/'.join(['datasets', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, lang=lang, limit=limit, offset=offset, orderBy=orderby, query=query
     )
@@ -114,6 +112,6 @@ def get_statisticalresources_datasets_agency_resource_version(
         ...     version="001.000"
         ... )
     """
-    path = os.path.join('datasets', agencyid, resourceid, version)
+    path = '/'.join(['datasets', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path, dim=dim, fields=fields, lang=lang)
     return services.get_content(url)

istacpy/structuralresources/category.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'structural-resources'
@@ -49,7 +47,7 @@ def get_structuralresources_categorisations_agency(
     Examples:
         >>> get_structuralresources_categorisations_agency("ISTAC")
     """
-    path = os.path.join('categorisations', agencyid)
+    path = '/'.join(['categorisations', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -75,7 +73,7 @@ def get_structuralresources_categorisations_agency_resource(
     Examples:
         >>> get_structuralresources_categorisations_agency_resource("ISTAC", "cat2")
     """
-    path = os.path.join('categorisations', agencyid, resourceid)
+    path = '/'.join(['categorisations', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -102,7 +100,7 @@ def get_structuralresources_categorisations_agency_resource_version(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('categorisations', agencyid, resourceid, version)
+    path = '/'.join(['categorisations', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -155,7 +153,7 @@ def get_structuralresources_category_schemes_agency(
         ...     orderby="ID ASC"
         ...)
     """
-    path = os.path.join('categoryschemes', agencyid)
+    path = '/'.join(['categoryschemes', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -184,7 +182,7 @@ def get_structuralresources_category_schemes_agency_resource(
         ...     "TEMAS_CANARIAS"
         ... )
     """
-    path = os.path.join('categoryschemes', agencyid, resourceid)
+    path = '/'.join(['categoryschemes', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -211,7 +209,7 @@ def get_structuralresources_category_schemes_agency_resource_version(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('categoryschemes', agencyid, resourceid, version)
+    path = '/'.join(['categoryschemes', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -241,7 +239,7 @@ def get_structuralresources_category_schemes_agency_resource_version_categories(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('categoryschemes', agencyid, resourceid, version, 'categories')
+    path = '/'.join(['categoryschemes', agencyid, resourceid, version, 'categories'])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -276,8 +274,8 @@ def get_structuralresources_category_schemes_agency_resource_version_categories_
         ...     "060.060_010.060_010_010"
         ... )
     """
-    path = os.path.join(
-        'categoryschemes', agencyid, resourceid, version, 'categories', categoryid
+    path = '/'.join(
+        ['categoryschemes', agencyid, resourceid, version, 'categories', categoryid]
     )
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)

istacpy/structuralresources/classifications.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'structural-resources'
@@ -38,7 +36,7 @@ def get_structuralresources_codelist_families_id(id):
     Examples:
         >>> get_structuralresources_codelist_families_id('CODELIST_ID')
     """
-    path = os.path.join('codelistfamilies', id)
+    path = '/'.join(['codelistfamilies', id])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -85,7 +83,7 @@ def get_structuralresources_codelists_agency(
         >>> get_structuralresources_codelists_agency("ISTAC")
         >>> get_structuralresources_codelists_agency("ESTAT")
     """
-    path = os.path.join('codelists', agencyid)
+    path = '/'.join(['codelists', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -112,7 +110,7 @@ def get_structuralresources_codelists_agency_resource(
     Examples:
         >>> get_structuralresources_codelists_agency_resource("ISTAC", "CL_AREA_ES")
     """
-    path = os.path.join('codelists', agencyid, resourceid)
+    path = '/'.join(['codelists', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -138,7 +136,7 @@ def get_structuralresources_codelists_agency_resource_version(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('codelists', agencyid, resourceid, version)
+    path = '/'.join(['codelists', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -181,7 +179,7 @@ def get_structuralresources_codelists_agency_resource_version_codes(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('codelists', agencyid, resourceid, version, 'codes')
+    path = '/'.join(['codelists', agencyid, resourceid, version, 'codes'])
     url = services.build_entrypoint_url(
         API,
         path,
@@ -213,6 +211,6 @@ def get_structuralresources_codelists_agency_resource_version_codes_codeid(
         >>> get_structuralresources_codelists_agency_resource_version_codes_codeid(
             "ISTAC", "CL_AREA_ES", "01.000", "ES706A01")
     """
-    path = os.path.join('codelists', agencyid, resourceid, version, 'codes', codeid)
+    path = '/'.join(['codelists', agencyid, resourceid, version, 'codes', codeid])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)

istacpy/structuralresources/concepts.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'structural-resources'
@@ -67,7 +65,7 @@ def get_structuralresources_concept_schemes_agency(
         ...     orderby="ID ASC"
         ... )
     """
-    path = os.path.join('conceptschemes', agencyid)
+    path = '/'.join(['conceptschemes', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -96,7 +94,7 @@ def get_structuralresources_concept_schemes_agency_resource(
         ...     resourceid="CSM_C00010A_SIE"
         ... )
     """
-    path = os.path.join('conceptschemes', agencyid, resourceid)
+    path = '/'.join(['conceptschemes', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -123,7 +121,7 @@ def get_structuralresources_concept_schemes_agency_resource_version(
         ...     version="01.000"
         ... )
     """
-    path = os.path.join('conceptschemes', agencyid, resourceid, version)
+    path = '/'.join(['conceptschemes', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -154,7 +152,7 @@ def get_structuralresources_concept_schemes_agency_resource_version_concepts(
         ...     version="01.000"
         ... )
     """
-    path = os.path.join('conceptschemes', agencyid, resourceid, version, 'concepts')
+    path = '/'.join(['conceptschemes', agencyid, resourceid, version, 'concepts'])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby, fields=fields
     )
@@ -183,8 +181,8 @@ def get_structuralresources_concept_schemes_agency_resource_version_concepts_id(
         ...     conceptID="ELECTORES"
         ... )
     """
-    path = os.path.join(
-        'conceptschemes', agencyid, resourceid, version, 'concepts', conceptid
+    path = '/'.join(
+        ['conceptschemes', agencyid, resourceid, version, 'concepts', conceptid]
     )
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)

istacpy/structuralresources/datastructures.py

@@ -1,5 +1,3 @@
-import os
-
 from istacpy import services
 
 API = 'structural-resources'
@@ -49,7 +47,7 @@ def get_structuralresources_content_constraints_agency(
     Examples:
         >>> get_structuralresources_content_constraints_agency("ISTAC")
     """
-    path = os.path.join('contentConstraints', agencyid)
+    path = '/'.join(['contentConstraints', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -79,7 +77,7 @@ def get_structuralresources_content_constraints_agency_resource(
         ...     "CSM_C00010A_SIE"
         ... )
     """
-    path = os.path.join('contentConstraints', agencyid, resourceid)
+    path = '/'.join(['contentConstraints', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -106,7 +104,7 @@ def get_structuralresources_content_constraints_agency_resource_version(
         ...     "01.000"
         ... )
     """
-    path = os.path.join('contentConstraints', agencyid, resourceid, version)
+    path = '/'.join(['contentConstraints', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
 
@@ -135,8 +133,8 @@ def get_structuralresources_content_constraints_agency_resource_version_regions(
         ... )
     """
     path = "contentConstraints"
-    path = os.path.join(
-        'contentConstraints', agencyid, resourceid, version, 'regions', regioncode
+    path = '/'.join(
+        ['contentConstraints', agencyid, resourceid, version, 'regions', regioncode]
     )
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)
@@ -186,7 +184,7 @@ def get_structuralresources_data_structures_agency(
     Examples:
         >>> get_structuralresources_data_structures_agency("ISTAC")
     """
-    path = os.path.join('datastructures', agencyid)
+    path = '/'.join(['datastructures', agencyid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -215,7 +213,7 @@ def get_structuralresources_data_structures_agency_resource(
         ...     "DSD_C00010A_00001"
         ... )
     """
-    path = os.path.join('datastructures', agencyid, resourceid)
+    path = '/'.join(['datastructures', agencyid, resourceid])
     url = services.build_entrypoint_url(
         API, path, limit=limit, offset=offset, query=query, orderBy=orderby
     )
@@ -242,6 +240,6 @@ def get_structuralresources_data_structures_agency_resource_version(
         ...     "01.001"
         ... )
     """
-    path = os.path.join('datastructures', agencyid, resourceid, version)
+    path = '/'.join(['datastructures', agencyid, resourceid, version])
     url = services.build_entrypoint_url(API, path)
     return services.get_content(url)