Merge lp://staging/~cjwatson/loggerhead/chameleon into lp://staging/loggerhead
| Status: | Merged |
|---|---|
| Approved by: | Colin Watson |
| Approved revision: | 528 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~cjwatson/loggerhead/chameleon |
| Merge into: | lp://staging/loggerhead |
| Diff against target: |
1174 lines (+209/-216) 25 files modified
.travis.yml (+1/-3) Dockerfile (+1/-1) NEWS (+2/-0) byov.conf (+2/-3) docs/index.rst (+3/-5) loggerhead/controllers/view_ui.py (+1/-1) loggerhead/main.py (+0/-8) loggerhead/templatefunctions.py (+2/-2) loggerhead/templates/atom.pt (+6/-6) loggerhead/templates/breadcrumbs.pt (+2/-2) loggerhead/templates/changelog.pt (+22/-22) loggerhead/templates/directory.pt (+13/-13) loggerhead/templates/error.pt (+7/-7) loggerhead/templates/feed-link.pt (+1/-1) loggerhead/templates/filediff.pt (+4/-4) loggerhead/templates/inventory.pt (+31/-31) loggerhead/templates/macros.pt (+1/-1) loggerhead/templates/revision.pt (+30/-30) loggerhead/templates/revisionfilechanges.pt (+19/-19) loggerhead/templates/revisioninfo.pt (+9/-9) loggerhead/templates/revlog.pt (+1/-1) loggerhead/templates/view.pt (+17/-17) loggerhead/tests/test_controllers.py (+29/-14) loggerhead/zptsupport.py (+5/-15) requirements.txt (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/loggerhead/chameleon |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Port from SimpleTAL to Chameleon.
Description of the change
SimpleTAL is a painful dependency, because it has no download files on PyPI: the only way to depend on it properly is therefore using a direct URL reference, and as I understand it packages with such references those can't be uploaded to PyPI.
Porting to Chameleon (Zope's default TAL implementation nowadays) turns out not to be too difficult. The main work involved is because it doesn't support path expressions. It would be possible to add those using `z3c.pt`, and I considered that, but that has a significant dependency tree for packages that don't already use the Zope Toolkit, and it would have also required extra startup complexity to register `ITraversable` adapters. It's easier to convert path expressions to the equivalent Python expressions, although the process of doing so was unfortunately quite error-prone.
13:28 <jelmer> cjwatson: the MR changing simpletal to chameleon LGTM
Jelmer isn't near his Launchpad credentials at the moment, so self-approving as a proxy for his review.