From: <mi...@us...> - 2012-09-12 07:22:31
|
Revision: 7510 http://docutils.svn.sourceforge.net/docutils/?rev=7510&view=rev Author: milde Date: 2012-09-12 07:22:25 +0000 (Wed, 12 Sep 2012) Log Message: ----------- Fix import of PIL.Image. Modified Paths: -------------- trunk/docutils/HISTORY.txt trunk/docutils/docutils/parsers/rst/directives/images.py trunk/docutils/docutils/writers/html4css1/__init__.py Modified: trunk/docutils/HISTORY.txt =================================================================== --- trunk/docutils/HISTORY.txt 2012-09-10 21:58:58 UTC (rev 7509) +++ trunk/docutils/HISTORY.txt 2012-09-12 07:22:25 UTC (rev 7510) @@ -24,6 +24,7 @@ - Fix [3541369] Relative __import__ also with Python 3.3. - Fix [3559988] and [3560841] __import__ local writer, reader, languages and parsers for Python 2.7 up. + - Fix import of PIL.Image. * docutils/io.py Modified: trunk/docutils/docutils/parsers/rst/directives/images.py =================================================================== --- trunk/docutils/docutils/parsers/rst/directives/images.py 2012-09-10 21:58:58 UTC (rev 7509) +++ trunk/docutils/docutils/parsers/rst/directives/images.py 2012-09-12 07:22:25 UTC (rev 7510) @@ -17,7 +17,7 @@ from docutils.nodes import fully_normalize_name, whitespace_normalize_name from docutils.parsers.rst.roles import set_classes try: # check for the Python Imaging Library - import PIL + import PIL.Image except ImportError: try: # sometimes PIL modules are put in PYTHONPATH's root import Image Modified: trunk/docutils/docutils/writers/html4css1/__init__.py =================================================================== --- trunk/docutils/docutils/writers/html4css1/__init__.py 2012-09-10 21:58:58 UTC (rev 7509) +++ trunk/docutils/docutils/writers/html4css1/__init__.py 2012-09-12 07:22:25 UTC (rev 7510) @@ -22,7 +22,7 @@ import re import urllib try: # check for the Python Imaging Library - import PIL + import PIL.Image except ImportError: try: # sometimes PIL modules are put in PYTHONPATH's root import Image @@ -602,7 +602,13 @@ '</tbody>\n</table>\n') def visit_citation_reference(self, node): - href = '#' + node['refid'] + href = '#' + if 'refid' in node: + href += node['refid'] + elif 'refname' in node: + href += self.document.nameids[node['refname']] + # else: # TODO system message (or already in the transform)? + # 'Citation reference missing.' self.body.append(self.starttag( node, 'a', '[', CLASS='citation-reference', href=href)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |