summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2004-09-10 12:59:54 +0000
committerAndrew M. Kuchling <amk@amk.ca>2004-09-10 12:59:54 +0000
commit55be9eab3874aa93dccdfcf3df4838e25e598cc4 (patch)
tree45f00bac31a36468ac42391e0e48d0b8d8cd3061
parent2cc0c3008ca3f86ba6b9f73718fb5c3c1095d76d (diff)
downloadcpython-git-55be9eab3874aa93dccdfcf3df4838e25e598cc4.tar.gz
Typo fix: 'comparisions' is not a word
-rw-r--r--Doc/lib/libdifflib.tex2
-rw-r--r--Doc/lib/libstdtypes.tex2
-rw-r--r--Lib/difflib.py2
-rw-r--r--Misc/cheatsheet2
-rw-r--r--Objects/listobject.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/Doc/lib/libdifflib.tex b/Doc/lib/libdifflib.tex
index 4256e877e3..c4a3f12126 100644
--- a/Doc/lib/libdifflib.tex
+++ b/Doc/lib/libdifflib.tex
@@ -55,7 +55,7 @@
\begin{classdesc*}{HtmlDiff}
This class can be used to create an HTML table (or a complete HTML file
- containing the table) showing a side by side, line by line comparision
+ containing the table) showing a side by side, line by line comparison
of text with inter-line and intra-line change highlights. The table can
be generated in either full or contextual difference mode.
diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index b531b61cc2..83d3c0352d 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -1092,7 +1092,7 @@ Notes:
the sorted or reversed list.
\item[(8)] The \method{sort()} method takes optional arguments for
- controlling the comparisions.
+ controlling the comparisons.
\var{cmp} specifies a custom comparison function of two arguments
(list items) which should return a negative, zero or positive number
diff --git a/Lib/difflib.py b/Lib/difflib.py
index f855d46a82..124ae9061a 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -1603,7 +1603,7 @@ class HtmlDiff(object):
"""For producing HTML side by side comparison with change highlights.
This class can be used to create an HTML table (or a complete HTML file
- containing the table) showing a side by side, line by line comparision
+ containing the table) showing a side by side, line by line comparison
of text with inter-line and intra-line change highlights. The table can
be generated in either full or contextual difference mode.
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index 525772d7c3..071f13d311 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -248,7 +248,7 @@ is not negated object identity (2)
Notes :
Comparison behavior can be overridden for a given class by defining special
method __cmp__.
- The above comparisions return True or False which are of type bool
+ The above comparisons return True or False which are of type bool
(a subclass of int) and behave exactly as 1 or 0 except for their type and
that they print as True or False instead of 1 or 0.
(1) X < Y < Z < W has expected meaning, unlike C
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 89cedc9bfa..996ddb95b1 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1759,7 +1759,7 @@ merge_compute_minrun(int n)
}
/* Special wrapper to support stable sorting using the decorate-sort-undecorate
- pattern. Holds a key which is used for comparisions and the original record
+ pattern. Holds a key which is used for comparisons and the original record
which is returned during the undecorate phase. By exposing only the key
during comparisons, the underlying sort stability characteristics are left
unchanged. Also, if a custom comparison function is used, it will only see