[Docutils-checkins] r3845 - trunk/docutils/docutils/parsers/rst/directives/images.py

[<go...@us...>]

Author: goodger
Date: 2005-09-03 04:59:53 +0200 (Sat, 03 Sep 2005)
New Revision: 3845

Modified:
   trunk/docutils/docutils/parsers/rst/directives/images.py
Log:
removed 1-argument use of ``setdefault``, slated to be removed from Python

Modified: trunk/docutils/docutils/parsers/rst/directives/images.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/images.py	2005-09-02 20:40:36 UTC (rev 3844)
+++ trunk/docutils/docutils/parsers/rst/directives/images.py	2005-09-03 02:59:53 UTC (rev 3845)
@@ -89,12 +89,15 @@
 
 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):