Merge ~r00ta/maas:fix-template-renderer into maas:master

Proposed by Jacopo Rota
Status: Merged
Approved by: Jacopo Rota
Approved revision: 17af1defd5d65fe95413037a2508067846f9113d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~r00ta/maas:fix-template-renderer
Merge into: maas:master
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/api/templates.py (+1/-1)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
MAAS Lander Approve
Review via email: mp+466139@code.launchpad.net

Commit message

fix: specify encoding in api docs renderer

To post a comment you must log in.
~r00ta/maas:fix-template-renderer updated
17af1de... by Jacopo Rota

linting

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-template-renderer lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5562/console
COMMIT: 17af1defd5d65fe95413037a2508067846f9113d

review: Needs Fixing
Revision history for this message
Jacopo Rota (r00ta) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-template-renderer lp:~r00ta/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 17af1defd5d65fe95413037a2508067846f9113d

review: Approve
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/api/templates.py b/src/maasserver/api/templates.py
2index 7c28a29..10be870 100644
3--- a/src/maasserver/api/templates.py
4+++ b/src/maasserver/api/templates.py
5@@ -35,7 +35,7 @@ class APITemplateRenderer:
6 # the dictionary supplied by the given APIDocstringParser
7 def apply_template(self, path, doc_string_parser):
8 # Load the given template
9- template = tempita.Template.from_filename(path)
10+ template = tempita.Template.from_filename(path, encoding="utf-8")
11
12 d = doc_string_parser.get_dict()
13

Subscribers

People subscribed via source and target branches