diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-12-16 20:01:43 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 20:01:43 +0900 |
commit | ea1d2d06f897a9685faab231b4ba2bca5fe7fbeb (patch) | |
tree | 74df35e11b24abf1393942e7927da20d171ee8ff /sphinx/ext/graphviz.py | |
parent | 2597c4174e386552449991a0a247340de3dbcdcc (diff) | |
parent | 5bf25eb44529cb0546b9b690a142ca7529a062f0 (diff) | |
download | sphinx-git-ea1d2d06f897a9685faab231b4ba2bca5fe7fbeb.tar.gz |
Merge pull request #5803 from jdufresne/encoding-utf8
Avoid respecifying default encoding for .encode()/.decode() calls
Diffstat (limited to 'sphinx/ext/graphviz.py')
-rw-r--r-- | sphinx/ext/graphviz.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index 108ef25ce..716fd1e42 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -73,7 +73,7 @@ class ClickableMapDefinition: if self.id == '%3': # graphviz generates wrong ID if graph name not specified # https://gitlab.com/graphviz/graphviz/issues/1327 - hashed = sha1(dot.encode('utf-8')).hexdigest() + hashed = sha1(dot.encode()).hexdigest() self.id = 'grapviz%s' % hashed[-10:] self.content[0] = self.content[0].replace('%3', self.id) @@ -221,7 +221,7 @@ def render_dot(self, code, options, format, prefix='graphviz'): """Render graphviz code into a PNG or PDF output file.""" graphviz_dot = options.get('graphviz_dot', self.builder.config.graphviz_dot) hashkey = (code + str(options) + str(graphviz_dot) + - str(self.builder.config.graphviz_dot_args)).encode('utf-8') + str(self.builder.config.graphviz_dot_args)).encode() fname = '%s-%s.%s' % (prefix, sha1(hashkey).hexdigest(), format) relfn = posixpath.join(self.builder.imgpath, fname) @@ -257,7 +257,7 @@ def render_dot(self, code, options, format, prefix='graphviz'): try: # Graphviz may close standard input when an error occurs, # resulting in a broken pipe on communicate() - stdout, stderr = p.communicate(code.encode('utf-8')) + stdout, stderr = p.communicate(code.encode()) except (OSError, IOError) as err: if err.errno not in (EPIPE, EINVAL): raise |