From f49f8f7532cd7ef144f6ef8b663ccf313e041776 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Tue, 28 Apr 2009 02:05:14 +0200 Subject: [PATCH] Improved changelog rendering --HG-- branch : trunk --- docs/changelog.rst | 5 ++--- docs/jinjaext.py | 14 -------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 6e514be..9f11484 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,4 +1,3 @@ -Changelog -========= +.. module:: jinja2 -.. jinjachangelog:: +.. include:: ../CHANGES diff --git a/docs/jinjaext.py b/docs/jinjaext.py index 65f9694..212c8bf 100644 --- a/docs/jinjaext.py +++ b/docs/jinjaext.py @@ -139,19 +139,6 @@ def dump_functions(mapping): return directive -def jinja_changelog(dirname, arguments, options, content, lineno, - content_offset, block_text, state, state_machine): - doc = ViewList() - changelog = file(os.path.join(os.path.dirname(jinja2.__file__), '..', - 'CHANGES')) - try: - for line in islice(changelog, 3, None): - doc.append(line.rstrip().decode('utf-8'), '') - finally: - changelog.close() - return parse_rst(state, content_offset, doc) - - from jinja2.defaults import DEFAULT_FILTERS, DEFAULT_TESTS jinja_filters = dump_functions(DEFAULT_FILTERS) jinja_tests = dump_functions(DEFAULT_TESTS) @@ -210,7 +197,6 @@ def inject_toc(app, doctree, docname): def setup(app): app.add_directive('jinjafilters', jinja_filters, 0, (0, 0, 0)) app.add_directive('jinjatests', jinja_tests, 0, (0, 0, 0)) - app.add_directive('jinjachangelog', jinja_changelog, 0, (0, 0, 0)) app.add_directive('jinjanodes', jinja_nodes, 0, (0, 0, 0)) # uncomment for inline toc. links are broken unfortunately ##app.connect('doctree-resolved', inject_toc) -- 2.26.2