diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-02-21 20:59:32 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-02-21 20:59:32 (GMT) |
| commit | 934896dc0977ea25dc37c13117525f2394625cee (patch) | |
| tree | f4671cebdd730ba732dcae5185548dd35b9ffa72 /Objects | |
| parent | 91cf882b367644ece7f121cd22fc43c2f439a2d5 (diff) | |
| download | cpython-934896dc0977ea25dc37c13117525f2394625cee.zip cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.gz cpython-934896dc0977ea25dc37c13117525f2394625cee.tar.bz2 | |
Merged revisions 69846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69846 | mark.dickinson | 2009-02-21 20:27:01 +0000 (Sat, 21 Feb 2009) | 2 lines
Issue #5341: Fix a variety of spelling errors.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/abstract.c | 2 | ||||
| -rw-r--r-- | Objects/listsort.txt | 2 | ||||
| -rw-r--r-- | Objects/object.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index 7d0ed06..a4d3964 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1872,7 +1872,7 @@ PySequence_Fast(PyObject *v, const char *m) /* Iterate over seq. Result depends on the operation: PY_ITERSEARCH_COUNT: -1 if error, else # of times obj appears in seq. - PY_ITERSEARCH_INDEX: 0-based index of first occurence of obj in seq; + PY_ITERSEARCH_INDEX: 0-based index of first occurrence of obj in seq; set ValueError and return -1 if none found; also return -1 on error. Py_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on error. */ diff --git a/Objects/listsort.txt b/Objects/listsort.txt index 9226984..31a5445 100644 --- a/Objects/listsort.txt +++ b/Objects/listsort.txt @@ -309,7 +309,7 @@ Stability constrains permissible merging patterns. For example, if we have A:10000 B:20000 C:10000 we dare not merge A with C first, because if A, B and C happen to contain -a common element, it would get out of order wrt its occurence(s) in B. The +a common element, it would get out of order wrt its occurrence(s) in B. The merging must be done as (A+B)+C or A+(B+C) instead. So merging is always done on two consecutive runs at a time, and in-place, diff --git a/Objects/object.c b/Objects/object.c index 8583797..2cb71dc 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1410,7 +1410,7 @@ static void none_dealloc(PyObject* ignore) { /* This should never get called, but we also don't want to SEGV if - * we accidently decref None out of existance. + * we accidentally decref None out of existence. */ Py_FatalError("deallocating None"); } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index aeaa53b..e88c8c1 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1927,7 +1927,7 @@ PyObject *PyUnicode_EncodeUTF7(const Py_UNICODE *s, charsleft = (charsleft << 16) | ch; /* out, charsleft, bitsleft = */ ENCODE(out, charsleft, bitsleft); - /* If the next character is special then we dont' need to terminate + /* If the next character is special then we don't need to terminate the shift sequence. If the next character is not a BASE64 character or '-' then the shift sequence will be terminated implicitly and we don't have to insert a '-'. */ |