Blob Blame History Raw
--- buildbot/www/plugin.py~	2023-12-04 19:56:01.256614200 -0600
+++ buildbot/www/plugin.py	2023-12-05 11:32:56.652503945 -0600
@@ -14,7 +14,7 @@
 # Copyright Buildbot Team Members
 
 
-import importlib_resources
+import importlib.resources
 
 from twisted.web import static
 
@@ -25,9 +25,9 @@
 
     def __init__(self, modulename, description, ui=True):
         self.description = description
-        self.version = importlib_resources.files(modulename).joinpath("VERSION")
+        self.version = importlib.resources.files(modulename).joinpath("VERSION")
         self.version = bytes2unicode(self.version.read_bytes())
-        self.static_dir = importlib_resources.files(modulename) / "static"
+        self.static_dir = importlib.resources.files(modulename) / "static"
         self.resource = static.File(self.static_dir)
         self.ui = ui
 
--- setup.py~	2023-12-05 11:24:57.136686896 -0600
+++ setup.py	2023-12-05 11:33:27.901491993 -0600
@@ -478,7 +478,6 @@
     'Jinja2 >= 2.1',
     'msgpack >= 0.6.0',
     "croniter >= 1.3.0",
-    'importlib-resources >= 5',
     # required for tests, but Twisted requires this anyway
     'zope.interface >= 4.1.1',
     'sqlalchemy >= 1.3.0, < 1.5',