From 6aebf13bdef4a9defd7a5c68cf4621f4a684b622 Mon Sep 17 00:00:00 2001 From: goodger Date: Wed, 29 Jun 2005 19:45:56 +0000 Subject: renamed "dummy" reader to "doctree" git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3631 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docutils/readers/doctree.py (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py new file mode 100644 index 000000000..dfb1bc804 --- /dev/null +++ b/docutils/readers/doctree.py @@ -0,0 +1,45 @@ +# Author: Martin Blais +# Contact: blais@furius.ca +# Revision: $Revision$ +# Date: $Date$ +# Copyright: This module has been placed in the public domain. + +"""Reader for existing document trees.""" + +from docutils import readers, utils + + +class Reader(readers.Reader): + + """ + Adapt the Reader API for an existing document tree. + + The existing document tree must be passed as the ``source`` parameter to + the `docutils.core.Publisher` initializer, wrapped in a + `docutils.io.DoctreeInput` object:: + + pub = docutils.core.Publisher( + ..., source=docutils.io.DoctreeInput(document), ...) + + The original document settings are overridden; if you want to use the + settings of the original document, pass ``settings=document.settings`` to + the Publisher call above. + """ + + supported = ('doctree',) + + config_section = 'doctree reader' + config_section_dependencies = ('readers',) + + def parse(self): + """ + No parsing to do; refurbish the document tree instead. + Overrides the inherited method. + """ + self.document = self.input + # Restore the reporter after document serialization: + if self.document.reporter is None: + self.document.reporter = utils.new_reporter( + self.document.source_path, self.settings) + # Override document settings with new settings: + self.document.settings = self.settings -- cgit v1.2.1 From 992191ceb9e0efbfc0d3249f52966e1261c2bbe3 Mon Sep 17 00:00:00 2001 From: blais Date: Thu, 30 Jun 2005 14:41:26 +0000 Subject: Fixed bug introduced in doctree reader, added pickle test back in. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3638 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py index dfb1bc804..5a4371983 100644 --- a/docutils/readers/doctree.py +++ b/docutils/readers/doctree.py @@ -40,6 +40,6 @@ class Reader(readers.Reader): # Restore the reporter after document serialization: if self.document.reporter is None: self.document.reporter = utils.new_reporter( - self.document.source_path, self.settings) + self.source.source_path, self.settings) # Override document settings with new settings: self.document.settings = self.settings -- cgit v1.2.1 From c5aecf0e115ab835a4c79657245bcaed911ad41e Mon Sep 17 00:00:00 2001 From: wiemann Date: Thu, 7 Jul 2005 02:11:14 +0000 Subject: separated default (universal) transforms into two stages so that no transform is applied twice; do not delete document.transformer in publish_doctree (Martin, this may be important for the pickle writer -- you may need to delete document.transformer); regenerate reporter object unconditionally; do so in publish_from_doctree, not the doctree reader; added tests; I will post about all that on Docutils-develop in one or two days git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3663 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py index 5a4371983..ec56e4099 100644 --- a/docutils/readers/doctree.py +++ b/docutils/readers/doctree.py @@ -37,9 +37,3 @@ class Reader(readers.Reader): Overrides the inherited method. """ self.document = self.input - # Restore the reporter after document serialization: - if self.document.reporter is None: - self.document.reporter = utils.new_reporter( - self.source.source_path, self.settings) - # Override document settings with new settings: - self.document.settings = self.settings -- cgit v1.2.1 From 019c9db1733295e6c56937d6a77005dba70b4fb9 Mon Sep 17 00:00:00 2001 From: wiemann Date: Fri, 8 Jul 2005 01:32:57 +0000 Subject: moved document refurbishing logic to doctree reader; added source_class argument to publish_parts; improved docstring git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3674 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py index ec56e4099..4ae7bd792 100644 --- a/docutils/readers/doctree.py +++ b/docutils/readers/doctree.py @@ -6,7 +6,7 @@ """Reader for existing document trees.""" -from docutils import readers, utils +from docutils import readers, utils, transforms class Reader(readers.Reader): @@ -37,3 +37,12 @@ class Reader(readers.Reader): Overrides the inherited method. """ self.document = self.input + # Create fresh Transformer object, to be populated from Writer + # component. + self.document.transformer = transforms.Transformer(self.document) + # Replace existing settings object with new one. + self.document.settings = self.settings + # Create fresh Reporter object because it is dependent on + # (new) settings. + self.document.reporter = utils.new_reporter( + self.document.get('source', ''), self.document.settings) -- cgit v1.2.1 From 5b111006c653af57889892100b7adc5ffcca8e6f Mon Sep 17 00:00:00 2001 From: wiemann Date: Tue, 20 Sep 2005 20:04:53 +0000 Subject: Merged "transforms" branch into trunk. - Replaced ``default_transforms`` attribute of TransformSpec with ``get_transforms()`` method. - Added universal.Decorations and universal.ExposeInternals transforms as default transforms for all readers. - Added universal.Messages and universal.FilterMessages transforms as default transforms for all writers. - Added ``ReReader`` base class for readers that reread an existing document tree. - Added ``UnfilteredWriter`` base class for writers that pass the document tree on unchanged. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3892 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py index 4ae7bd792..a1984e966 100644 --- a/docutils/readers/doctree.py +++ b/docutils/readers/doctree.py @@ -9,7 +9,7 @@ from docutils import readers, utils, transforms -class Reader(readers.Reader): +class Reader(readers.ReReader): """ Adapt the Reader API for an existing document tree. -- cgit v1.2.1 From 5a2fe25641fb8bccf11187fd9e5e6926cfe2f2c2 Mon Sep 17 00:00:00 2001 From: goodger Date: Tue, 8 Nov 2005 02:38:20 +0000 Subject: typo git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@4006 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/readers/doctree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docutils/readers/doctree.py') diff --git a/docutils/readers/doctree.py b/docutils/readers/doctree.py index a1984e966..4138fb51e 100644 --- a/docutils/readers/doctree.py +++ b/docutils/readers/doctree.py @@ -16,10 +16,10 @@ class Reader(readers.ReReader): The existing document tree must be passed as the ``source`` parameter to the `docutils.core.Publisher` initializer, wrapped in a - `docutils.io.DoctreeInput` object:: + `docutils.io.DocTreeInput` object:: pub = docutils.core.Publisher( - ..., source=docutils.io.DoctreeInput(document), ...) + ..., source=docutils.io.DocTreeInput(document), ...) The original document settings are overridden; if you want to use the settings of the original document, pass ``settings=document.settings`` to -- cgit v1.2.1