summaryrefslogtreecommitdiff
path: root/Lib/difflib.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-16 11:38:59 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-16 11:38:59 +0200
commitb88ed1549e76fadf161227d15cc307f0e8b94c59 (patch)
tree7fea10f9a15064480554f093da39f361df463c61 /Lib/difflib.py
parentc8a03349d174379f051ab93d02a2918a15269e00 (diff)
parent3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (diff)
downloadcpython-git-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.gz
#11565: Merge with 3.2.
Diffstat (limited to 'Lib/difflib.py')
-rw-r--r--Lib/difflib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py
index 381721a251..003e72e283 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -1719,7 +1719,7 @@ class HtmlDiff(object):
line = line.replace(' ','\0')
# expand tabs into spaces
line = line.expandtabs(self._tabsize)
- # relace spaces from expanded tabs back into tab characters
+ # replace spaces from expanded tabs back into tab characters
# (we'll replace them with markup after we do differencing)
line = line.replace(' ','\t')
return line.replace('\0',' ').rstrip('\n')