mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #2052: Add charset parameter to HtmlDiff.make_file().

Browse source
This commit is contained in:
Berker Peksag 2015-03-15 01:18:47 +02:00
parent fbd011dd49
commit 102029dfd6
6 changed files with 63 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/difflib.py
View file

@ -1598,7 +1598,7 @@ _file_template = """
<head>
<meta http-equiv="Content-Type"
content="text/html; charset=ISO-8859-1" />
content="text/html; charset=%(charset)s" />
<title></title>
<style type="text/css">%(styles)s
</style>
@ -1685,8 +1685,8 @@ class HtmlDiff(object):
self._linejunk = linejunk
self._charjunk = charjunk
def make_file(self,fromlines,tolines,fromdesc='',todesc='',context=False,
numlines=5):
def make_file(self, fromlines, tolines, fromdesc='', todesc='',
context=False, numlines=5, *, charset='utf-8'):
"""Returns HTML file of side by side comparison with change highlights
Arguments:
@ -1701,13 +1701,16 @@ class HtmlDiff(object):
When context is False, controls the number of lines to place
the "next" link anchors before the next change (so click of
"next" link jumps to just before the change).
charset -- charset of the HTML document
"""
return self._file_template % dict(
styles = self._styles,
legend = self._legend,
table = self.make_table(fromlines,tolines,fromdesc,todesc,
context=context,numlines=numlines))
return (self._file_template % dict(
styles=self._styles,
legend=self._legend,
table=self.make_table(fromlines, tolines, fromdesc, todesc,
context=context, numlines=numlines),
charset=charset
)).encode(charset, 'xmlcharrefreplace').decode(charset)
def _tab_newline_replace(self,fromlines,tolines):
"""Returns from/to line lists with tabs expanded and newlines removed.