diff options
| author | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-09-03 02:59:53 +0000 |
|---|---|---|
| committer | goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2005-09-03 02:59:53 +0000 |
| commit | 8ef551960b648500dd88e1f8109792d4503ef235 (patch) | |
| tree | 5c90f7461a2287365f1d7c820914d36e606d1747 /docutils/parsers/rst/directives/images.py | |
| parent | b95d84cfc83f7934e18ab1a35fd8176104a5e249 (diff) | |
| download | docutils-8ef551960b648500dd88e1f8109792d4503ef235.tar.gz | |
removed 1-argument use of ``setdefault``, slated to be removed from Python
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3845 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/parsers/rst/directives/images.py')
| -rw-r--r-- | docutils/parsers/rst/directives/images.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docutils/parsers/rst/directives/images.py b/docutils/parsers/rst/directives/images.py index 1c9c50e26..8dc94af96 100644 --- a/docutils/parsers/rst/directives/images.py +++ b/docutils/parsers/rst/directives/images.py @@ -89,12 +89,15 @@ def figure_align(argument): def figure(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine): - figwidth = options.setdefault('figwidth') - figclasses = options.setdefault('figclass') - align = options.setdefault('align') - del options['figwidth'] - del options['figclass'] - del options['align'] + figwidth = options.get('figwidth') + if figwidth: + del options['figwidth'] + figclasses = options.get('figclass') + if figclasses: + del options['figclass'] + align = options.get('align') + if align: + del options['align'] (image_node,) = image(name, arguments, options, content, lineno, content_offset, block_text, state, state_machine) if isinstance(image_node, nodes.system_message): |