Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deform/renderer.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Renderer."""

from pkg_resources import resource_filename
# Standard Library
from importlib.resources import files

# Deform
import deform
Expand Down Expand Up @@ -44,7 +45,7 @@ def translator(term):
paths = []
for path in search_path:
pkg, resource_name = path.split(":")
paths.append(resource_filename(pkg, resource_name))
paths.append(str(files(pkg).joinpath(resource_name)))

deform.form.Form.default_renderer = deform.ZPTRendererFactory(
tuple(paths) + default_paths, translator=translator
Expand Down
8 changes: 4 additions & 4 deletions deform/template.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""Template."""

# Standard Library
from importlib.resources import files
import os.path

from chameleon.zpt.loader import TemplateLoader
from pkg_resources import resource_filename
from translationstring import ChameleonTranslate

from .exception import TemplateError
Expand Down Expand Up @@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
def load(self, filename, *args, **kwargs):
if ":" in filename:
pkg_name, fn = filename.split(":", 1)
filename = resource_filename(pkg_name, fn)
filename = str(files(pkg_name).joinpath(fn))
else:
path, ext = os.path.splitext(filename)
if not ext:
Expand All @@ -58,7 +58,7 @@ class ZPTRendererFactory(object):

If the template name is an asset spec (has a colon in it, e.g.
``mypackage:subdir/subdir2/mytemplate.pt``), use
``pkg_resources.resource_filename`` to resolve it.
``importlib.resources`` to resolve it.
Otherwise, fall back to search-path-based machinery to resolve it.

Allowing an asset spec allows users to specify templates without the
Expand Down Expand Up @@ -122,5 +122,5 @@ def load(self, template_name):
return self.loader.load(template_name)


default_dir = resource_filename("deform", "templates/")
default_dir = str(files("deform").joinpath("templates"))
default_renderer = ZPTRendererFactory((default_dir,))
5 changes: 3 additions & 2 deletions deform/tests/test_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@ def test_set_default_resource_registry(self):
def test_set_zpt_renderer(self):
cls = self._getTargetClass()
old = cls.default_renderer
from pkg_resources import resource_filename
# Standard Library
from importlib.resources import files

template_dir = resource_filename("deform", "templates/")
template_dir = str(files("deform").joinpath("templates"))

class Field:
oid = None
Expand Down
5 changes: 3 additions & 2 deletions deform/tests/test_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ def _makeOne(self, dirs, **kw):
return ZPTRendererFactory(dirs, **kw)

def test_functional(self):
from pkg_resources import resource_filename
# Standard Library
from importlib.resources import files

default_dir = resource_filename("deform", "tests/fixtures/")
default_dir = str(files("deform").joinpath("tests/fixtures"))
renderer = self._makeOne((default_dir,))
result = renderer("test")
self.assertEqual(result.strip(), str("<div>Test</div>"))
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools<81.0.0", "wheel"]
requires = ["setuptools", "wheel"]

[tool.black]
line-length = 79
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def readfile(name):
"peppercorn>=0.3", # rename operation type
"translationstring>=1.0", # add format mapping with %
"zope.deprecation",
"setuptools<81.0.0",
]

lint_extras = [
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ commands =
python --version
pytest {posargs:}
deps =
setuptools<81.0.0
setuptools

[testenv:py311-cover]
commands =
python --version
pytest --cov {posargs:}
deps =
setuptools<81.0.0
setuptools

[testenv:lint]
commands =
Expand Down Expand Up @@ -92,5 +92,5 @@ commands =
# build wheel from sdist
pip wheel -v --no-deps --no-index --no-build-isolation --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist deform
deps =
setuptools<81.0.0
setuptools
wheel