diff options
| author | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2002-09-04 01:33:22 +0000 |
|---|---|---|
| committer | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2002-09-04 01:33:22 +0000 |
| commit | a024b2b067ec8a092d783c9baed4b43dd5898d56 (patch) | |
| tree | 5193ba9efeea99a82f1cc00f28b189c0f75a7155 /docutils/parsers/rst/directives/images.py | |
| parent | 520f573499ee93fd4953686d5a71c30f9ec04ce1 (diff) | |
| download | docutils-a024b2b067ec8a092d783c9baed4b43dd5898d56.tar.gz | |
Converted system messages to use the new "line" attribute.
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@622 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/parsers/rst/directives/images.py')
| -rw-r--r-- | docutils/parsers/rst/directives/images.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/docutils/parsers/rst/directives/images.py b/docutils/parsers/rst/directives/images.py index 94599b933..e63105a12 100644 --- a/docutils/parsers/rst/directives/images.py +++ b/docutils/parsers/rst/directives/images.py @@ -41,15 +41,15 @@ def image(match, type_name, data, state, state_machine, option_presets): attlines = [] if not datablock: error = state_machine.reporter.error( - 'Missing image URI argument at line %s.' % lineno, '', - nodes.literal_block(blocktext, blocktext)) + 'Missing image URI argument.', '', + nodes.literal_block(blocktext, blocktext), line=lineno) return [error], blank_finish attoffset = line_offset + i reference = ''.join([line.strip() for line in datablock]) if reference.find(' ') != -1: error = state_machine.reporter.error( - 'Image URI at line %s contains whitespace.' % lineno, '', - nodes.literal_block(blocktext, blocktext)) + 'Image URI contains whitespace.', '', + nodes.literal_block(blocktext, blocktext), line=lineno) return [error], blank_finish if attlines: success, data, blank_finish = state.parse_extension_options( @@ -58,15 +58,16 @@ def image(match, type_name, data, state, state_machine, option_presets): option_presets.update(data) else: # data is an error string error = state_machine.reporter.error( - 'Error in "%s" directive options at line %s:\n%s.' - % (match.group(1), lineno, data), '', - nodes.literal_block(blocktext, blocktext)) + 'Error in "%s" directive options:\n%s.' + % (match.group(1), data), '', + nodes.literal_block(blocktext, blocktext), line=lineno) return [error], blank_finish option_presets['uri'] = reference imagenode = nodes.image(blocktext, **option_presets) return [imagenode], blank_finish def figure(match, type_name, data, state, state_machine, option_presets): + lineno = state_machine.abs_line_number() line_offset = state_machine.line_offset (imagenode,), blank_finish = image(match, type_name, data, state, state_machine, option_presets) @@ -90,7 +91,7 @@ def figure(match, type_name, data, state, state_machine, option_presets): elif not (isinstance(firstnode, nodes.comment) and len(firstnode) == 0): error = state_machine.reporter.error( 'Figure caption must be a paragraph or empty comment.', '', - nodes.literal_block(blocktext, blocktext)) + nodes.literal_block(blocktext, blocktext), line=lineno) return [figurenode, error], blank_finish if len(node) > 1: figurenode += nodes.legend('', *node[1:]) |