[Python-checkins] r64720 - in doctools/branches/0.4.x: CHANGES sphinx/builder.py

Sat Jul 5 12:04:42 CEST 2008

Author: georg.brandl
Date: Sat Jul 5 12:04:41 2008
New Revision: 64720
Log:
Fix warning for nonexisting images.
Modified:
 doctools/branches/0.4.x/CHANGES
 doctools/branches/0.4.x/sphinx/builder.py
Modified: doctools/branches/0.4.x/CHANGES
==============================================================================

--- doctools/branches/0.4.x/CHANGES	(original)
+++ doctools/branches/0.4.x/CHANGES	Sat Jul 5 12:04:41 2008
@@ -25,6 +25,8 @@
 
 * Fix the ``delete()`` docstring processor function in autodoc.
 
+* Fix warning message for nonexisting images.
+
 
 Release 0.4 (Jun 23, 2008)
 ==========================
Modified: doctools/branches/0.4.x/sphinx/builder.py
==============================================================================
--- doctools/branches/0.4.x/sphinx/builder.py	(original)
+++ doctools/branches/0.4.x/sphinx/builder.py	Sat Jul 5 12:04:41 2008
@@ -138,7 +138,7 @@
 break
 else:
 self.warn('%s:%s: no matching candidate for image URI %r' %
- (node.source, node.lineno, node['uri']))
+ (node.source, getattr(node, 'lineno', ''), node['uri']))
 continue
 node['uri'] = candidate
 else:
