summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-05-08 12:54:15 +0200
committerGeorg Brandl <georg@python.org>2012-05-08 12:54:15 +0200
commita410d3e6399806949dbf6dd2f99a5ab44513e6c8 (patch)
treef520f2e91e4f17463e8c2a873b1c13c7d4532afe
parent20253d383849068538a6ffb18548abca3ee4b091 (diff)
parentfeba7aa37792f5284cd99d007778a0ef636a8f21 (diff)
downloadsphinx-a410d3e6399806949dbf6dd2f99a5ab44513e6c8.tar.gz
Merged in xarthisius/sphinx (pull request #63)
-rw-r--r--sphinx/ext/graphviz.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index 28938140..3cb289a9 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -229,10 +229,10 @@ def render_dot_html(self, node, code, options, prefix='graphviz',
(fname, alt, imgcss))
else:
# has a map: get the name of the map and connect the parts
- mapname = mapname_re.match(imgmap[0]).group(1)
+ mapname = mapname_re.match(imgmap[0].decode('utf-8')).group(1)
self.body.append('<img src="%s" alt="%s" usemap="#%s" %s/>\n' %
(fname, alt, mapname, imgcss))
- self.body.extend(imgmap)
+ self.body.extend([item.decode('utf-8') for item in imgmap])
if node.get('caption') and not inline:
self.body.append('</p>\n<p class="caption">')
self.body.append(self.encode(node['caption']))