Skip to content

Commit 7e47402

Browse files
committed
Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either
comments, docstrings or error messages. I fixed two minor things in test_winreg.py ("didn't" -> "Didn't" and "Didnt" -> "Didn't"). There is a minor style issue involved: Guido seems to have preferred English grammar (behaviour, honour) in a couple places. This patch changes that to American, which is the more prominent style in the source. I prefer English myself, so if English is preferred, I'd be happy to supply a patch myself ;)
1 parent c533e4a commit 7e47402

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+184
-184
lines changed

Demo/sgi/gl/kites.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def viewobj (r, s, t, mat) :
4343
popmatrix()
4444

4545
#
46-
# makeobj : the contructor of the object
46+
# makeobj : the constructor of the object
4747
#
4848
def mkobj () :
4949
v0 = (-5.0 ,0.0, 0.0)

Demo/sgi/video/OldVcopy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ def report(time, iframe):
1515
print 'Frame', iframe, ': t =', time
1616

1717
def usage():
18-
sys.stderr.write('usage: Vcopy [-t type] [-m treshold] [-a] infile outfile\n')
18+
sys.stderr.write('usage: Vcopy [-t type] [-m threshold] [-a] infile outfile\n')
1919
sys.stderr.write('-t Convert to other type\n')
2020
sys.stderr.write('-a Automatic\n')
21-
sys.stderr.write('-m Convert grey to mono with treshold\n')
21+
sys.stderr.write('-m Convert grey to mono with threshold\n')
2222
sys.stderr.write('-d Convert grey to mono with dithering\n')
2323
sys.exit(2)
2424

Demo/sgi/video/Vrec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def usage():
2626
print '-g bits : greyscale (2, 4 or 8 bits)'
2727
print '-G : 2-bit greyscale dithered'
2828
print '-m : monochrome dithered'
29-
print '-M value : monochrome tresholded with value'
29+
print '-M value : monochrome thresholded with value'
3030
print '-f : Capture fields (in stead of frames)'
3131
print '-P frames : preallocate space for "frames" frames'
3232
print 'moviefile : here goes the movie data (default film.video)'

Demo/sgi/video/Vrecb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def usage():
4545
print '-g bits : greyscale (2, 4 or 8 bits)'
4646
print '-G : 2-bit greyscale dithered'
4747
print '-m : monochrome dithered'
48-
print '-M value : monochrome tresholded with value'
48+
print '-M value : monochrome thresholded with value'
4949
print '-f : Capture fields (instead of frames)'
5050
print '-n number : Capture this many frames (default 60)'
5151
print '-N memsize : Capture frames fitting in this many kbytes'

Include/abstract.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
695695
DL_IMPORT(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
696696

697697
/*
698-
Return the concatination of o1 and o2 on success, and NULL on
698+
Return the concatenation of o1 and o2 on success, and NULL on
699699
failure. This is the equivalent of the Python
700700
expression: o1+o2.
701701

Include/cStringIO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
7272
*/
7373

74-
/* Basic fuctions to manipulate cStringIO objects from C */
74+
/* Basic functions to manipulate cStringIO objects from C */
7575

7676
static struct PycStringIO_CAPI {
7777

Include/cobject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern DL_IMPORT(PyTypeObject) PyCObject_Type;
2828
#define PyCObject_Check(op) ((op)->ob_type == &PyCObject_Type)
2929

3030
/* Create a PyCObject from a pointer to a C object and an optional
31-
destrutor function. If the second argument is non-null, then it
31+
destructor function. If the second argument is non-null, then it
3232
will be called with the first argument if and when the PyCObject is
3333
destroyed.
3434
@@ -38,7 +38,7 @@ PyCObject_FromVoidPtr(void *cobj, void (*destruct)(void*));
3838

3939

4040
/* Create a PyCObject from a pointer to a C object, a description object,
41-
and an optional destrutor function. If the third argument is non-null,
41+
and an optional destructor function. If the third argument is non-null,
4242
then it will be called with the first and second arguments if and when
4343
the PyCObject is destroyed.
4444
*/

Include/longintrepr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef BASE_TWODIGITS_TYPE stwodigits; /* signed variant of twodigits */
4444
In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
4545
digit) is never zero. Also, in all cases, for all valid i,
4646
0 <= ob_digit[i] <= MASK.
47-
The allocation fuction takes care of allocating extra memory
47+
The allocation function takes care of allocating extra memory
4848
so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. */
4949

5050
struct _longobject {

Include/modsupport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
4444
#define PYTHON_API_STRING "1009"
4545
/* The API version is maintained (independently from the Python version)
4646
so we can detect mismatches between the interpreter and dynamically
47-
loaded modules. These are diagnosticised by an error message but
47+
loaded modules. These are diagnosed by an error message but
4848
the module is still loaded (because the mismatch can only be tested
4949
after loading the module). The error message is intended to
5050
explain the core dump a few seconds later.

Include/object.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ and the type pointer. The actual memory allocated for an object
5151
contains other data that can only be accessed after casting the pointer
5252
to a pointer to a longer structure type. This longer type must start
5353
with the reference count and type fields; the macro PyObject_HEAD should be
54-
used for this (to accomodate for future changes). The implementation
54+
used for this (to accommodate for future changes). The implementation
5555
of a particular object type can cast the object pointer to the proper
5656
type and back.
5757
@@ -326,7 +326,7 @@ The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
326326
reference counts. Py_DECREF calls the object's deallocator function; for
327327
objects that don't contain references to other objects or heap memory
328328
this can be the standard function free(). Both macros can be used
329-
whereever a void expression is allowed. The argument shouldn't be a
329+
wherever a void expression is allowed. The argument shouldn't be a
330330
NIL pointer. The macro _Py_NewReference(op) is used only to initialize
331331
reference counts to 1; it is defined here for convenience.
332332
@@ -518,7 +518,7 @@ times.
518518
redefinition for better locality and less overhead.
519519
520520
Objects that want to be recursion safe need to use
521-
the macroes
521+
the macro's
522522
Py_TRASHCAN_SAFE_BEGIN(name)
523523
and
524524
Py_TRASHCAN_SAFE_END(name)

0 commit comments

Comments
 (0)