Consolidate use of galaxy.util.resources

galaxyproject · Apr 15, 2024 · c286930 · c286930
1 parent 2317db7
commit c286930
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
@@ -51,6 +51,7 @@
     read_properties_from_file,
     running_from_source,
 )
+from galaxy.util.resources import files
 from galaxy.util.themes import flatten_theme
 from ..version import (
     VERSION_MAJOR,
@@ -60,11 +61,6 @@
 if TYPE_CHECKING:
     from galaxy.model import User
 
-if sys.version_info >= (3, 9):
-    from importlib.resources import files
-else:
-    from importlib_resources import files
-
 log = logging.getLogger(__name__)
 
 DEFAULT_LOCALE_FORMAT = "%a %b %e %H:%M:%S %Y"

diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py
@@ -51,6 +51,7 @@
     safe_makedirs,
     unicodify,
 )
+from galaxy.util.resources import files
 from galaxy.util.sanitize_html import sanitize_html
 from galaxy.version import VERSION
 from galaxy.web.framework import (
@@ -60,12 +61,6 @@
 )
 from galaxy.web.framework.middleware.static import CacheableStaticURLParser as Static
 
-try:
-    from importlib.resources import files  # type: ignore[attr-defined]
-except ImportError:
-    # Python < 3.9
-    from importlib_resources import files  # type: ignore[no-redef]
-
 log = logging.getLogger(__name__)