From b781f38accaeea8a4aa15c8bf17393f0c69d0d0c Mon Sep 17 00:00:00 2001
From: SoniEx2 <endermoneymod@gmail.com>
Date: Sun, 17 Mar 2024 11:42:17 -0300
Subject: Rename more URL -> URI

---
 ganarchy/cli/debug.py | 6 +++---
 ganarchy/core.py      | 2 +-
 ganarchy/data.py      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ganarchy')

diff --git a/ganarchy/cli/debug.py b/ganarchy/cli/debug.py
index e44d235..1d63c62 100644
--- a/ganarchy/cli/debug.py
+++ b/ganarchy/cli/debug.py
@@ -40,12 +40,12 @@ def print_data_source(data_source):
             title = None
         click.echo("\tTitle: {}".format(title))
 
-    if ganarchy.data.DataProperty.INSTANCE_BASE_URL in data_source.get_supported_properties():
+    if ganarchy.data.DataProperty.INSTANCE_BASE_URI in data_source.get_supported_properties():
         try:
-            base_url = data_source.get_property_value(ganarchy.data.DataProperty.INSTANCE_BASE_URL)
+            base_url = data_source.get_property_value(ganarchy.data.DataProperty.INSTANCE_BASE_URI)
         except LookupError:
             base_url = None
-        click.echo("\tBase URL: {}".format(base_url))
+        click.echo("\tBase URI: {}".format(base_url))
 
     if ganarchy.data.DataProperty.REPO_LIST_SOURCES in data_source.get_supported_properties():
         click.echo("\tRepo list sources:")
diff --git a/ganarchy/core.py b/ganarchy/core.py
index d882a57..62e9976 100644
--- a/ganarchy/core.py
+++ b/ganarchy/core.py
@@ -262,7 +262,7 @@ class GAnarchy:
         """
         try:
             base_url = self._config.get_property_value(
-                ganarchy.data.DataProperty.INSTANCE_BASE_URL
+                ganarchy.data.DataProperty.INSTANCE_BASE_URI
             )
         except LookupError:
             # FIXME use a more appropriate error type
diff --git a/ganarchy/data.py b/ganarchy/data.py
index c803b9b..4d675cb 100644
--- a/ganarchy/data.py
+++ b/ganarchy/data.py
@@ -53,7 +53,7 @@ def _is_uri(obj, ports=range(1,65536), schemes=('https',)):
         # also raises for invalid ports, see
         # https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlparse
         # "Reading the port attribute will raise a ValueError if an
-        # invalid port is specified in the URL. [...]"
+        # invalid port is specified in the URI. [...]"
         if u.port is not None and u.port not in ports:
             return False
         if u.scheme not in schemes:
@@ -164,7 +164,7 @@ class DataProperty(Enum):
     DataSource get_property_values for more details.
     """
     INSTANCE_TITLE = (1, str)
-    INSTANCE_BASE_URL = (2, str)
+    INSTANCE_BASE_URI = (2, str)
     VCS_REPOS = (3, PCTP)
     REPO_LIST_SOURCES = (4, RepoListSource)
     INSTANCE_FEDITO = (5, int)
@@ -325,7 +325,7 @@ class ObjectDataSource(DataSource):
 
     _SUPPORTED_PROPERTIES = {
         DataProperty.INSTANCE_TITLE: _get_instance_title,
-        DataProperty.INSTANCE_BASE_URL: _get_instance_base_uri,
+        DataProperty.INSTANCE_BASE_URI: _get_instance_base_uri,
         DataProperty.INSTANCE_FEDITO: _get_instance_fedito,
         DataProperty.VCS_REPOS: _get_vcs_repos,
         DataProperty.REPO_LIST_SOURCES: _get_repo_list_sources,
-- 
cgit 1.4.1