[Python-checkins] CVS: python/dist/src/Include abstract.h,2.23,2.24 cStringIO.h,2.12,2.13 cobject.h,2.8,2.9 longintrepr.h,2.9,2.10 modsupport.h,2.31,2.32 object.h,2.62,2.63 unicodeobject.h,2.14,2.15
Thomas Wouters
python-dev@python.org
2000年7月16日 05:05:03 -0700
Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11187/Include
Modified Files:
abstract.h cStringIO.h cobject.h longintrepr.h modsupport.h
object.h unicodeobject.h
Log Message:
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 ;)
Index: abstract.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/abstract.h,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -r2.23 -r2.24
*** abstract.h 2000年07月13日 19:39:15 2.23
--- abstract.h 2000年07月16日 12:04:30 2.24
***************
*** 696,700 ****
/*
! Return the concatination of o1 and o2 on success, and NULL on
failure. This is the equivalent of the Python
expression: o1+o2.
--- 696,700 ----
/*
! Return the concatenation of o1 and o2 on success, and NULL on
failure. This is the equivalent of the Python
expression: o1+o2.
Index: cStringIO.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cStringIO.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** cStringIO.h 2000年07月09日 03:09:55 2.12
--- cStringIO.h 2000年07月16日 12:04:30 2.13
***************
*** 72,76 ****
*/
! /* Basic fuctions to manipulate cStringIO objects from C */
static struct PycStringIO_CAPI {
--- 72,76 ----
*/
! /* Basic functions to manipulate cStringIO objects from C */
static struct PycStringIO_CAPI {
Index: cobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cobject.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** cobject.h 2000年07月09日 00:20:36 2.8
--- cobject.h 2000年07月16日 12:04:30 2.9
***************
*** 29,33 ****
/* Create a PyCObject from a pointer to a C object and an optional
! destrutor function. If the second argument is non-null, then it
will be called with the first argument if and when the PyCObject is
destroyed.
--- 29,33 ----
/* Create a PyCObject from a pointer to a C object and an optional
! destructor function. If the second argument is non-null, then it
will be called with the first argument if and when the PyCObject is
destroyed.
***************
*** 39,43 ****
/* Create a PyCObject from a pointer to a C object, a description object,
! and an optional destrutor function. If the third argument is non-null,
then it will be called with the first and second arguments if and when
the PyCObject is destroyed.
--- 39,43 ----
/* Create a PyCObject from a pointer to a C object, a description object,
! and an optional destructor function. If the third argument is non-null,
then it will be called with the first and second arguments if and when
the PyCObject is destroyed.
Index: longintrepr.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/longintrepr.h,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** longintrepr.h 2000年07月08日 04:17:21 2.9
--- longintrepr.h 2000年07月16日 12:04:30 2.10
***************
*** 45,49 ****
digit) is never zero. Also, in all cases, for all valid i,
0 <= ob_digit[i] <= MASK.
! The allocation fuction takes care of allocating extra memory
so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. */
--- 45,49 ----
digit) is never zero. Also, in all cases, for all valid i,
0 <= ob_digit[i] <= MASK.
! The allocation function takes care of allocating extra memory
so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. */
Index: modsupport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/modsupport.h,v
retrieving revision 2.31
retrieving revision 2.32
diff -C2 -r2.31 -r2.32
*** modsupport.h 2000年07月08日 17:25:54 2.31
--- modsupport.h 2000年07月16日 12:04:30 2.32
***************
*** 45,49 ****
/* The API version is maintained (independently from the Python version)
so we can detect mismatches between the interpreter and dynamically
! loaded modules. These are diagnosticised by an error message but
the module is still loaded (because the mismatch can only be tested
after loading the module). The error message is intended to
--- 45,49 ----
/* The API version is maintained (independently from the Python version)
so we can detect mismatches between the interpreter and dynamically
! loaded modules. These are diagnosed by an error message but
the module is still loaded (because the mismatch can only be tested
after loading the module). The error message is intended to
Index: object.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/object.h,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -r2.62 -r2.63
*** object.h 2000年07月09日 14:22:08 2.62
--- object.h 2000年07月16日 12:04:30 2.63
***************
*** 52,56 ****
to a pointer to a longer structure type. This longer type must start
with the reference count and type fields; the macro PyObject_HEAD should be
! used for this (to accomodate for future changes). The implementation
of a particular object type can cast the object pointer to the proper
type and back.
--- 52,56 ----
to a pointer to a longer structure type. This longer type must start
with the reference count and type fields; the macro PyObject_HEAD should be
! used for this (to accommodate for future changes). The implementation
of a particular object type can cast the object pointer to the proper
type and back.
***************
*** 327,331 ****
objects that don't contain references to other objects or heap memory
this can be the standard function free(). Both macros can be used
! whereever a void expression is allowed. The argument shouldn't be a
NIL pointer. The macro _Py_NewReference(op) is used only to initialize
reference counts to 1; it is defined here for convenience.
--- 327,331 ----
objects that don't contain references to other objects or heap memory
this can be the standard function free(). Both macros can be used
! wherever a void expression is allowed. The argument shouldn't be a
NIL pointer. The macro _Py_NewReference(op) is used only to initialize
reference counts to 1; it is defined here for convenience.
***************
*** 519,523 ****
Objects that want to be recursion safe need to use
! the macroes
Py_TRASHCAN_SAFE_BEGIN(name)
and
--- 519,523 ----
Objects that want to be recursion safe need to use
! the macro's
Py_TRASHCAN_SAFE_BEGIN(name)
and
Index: unicodeobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** unicodeobject.h 2000年07月07日 13:45:44 2.14
--- unicodeobject.h 2000年07月16日 12:04:30 2.15
***************
*** 494,498 ****
Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
UCS-2. This trick makes it possible to add full UTF-16 capabilities
! at a later point without comprimising the APIs.
*/
--- 494,498 ----
Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
UCS-2. This trick makes it possible to add full UTF-16 capabilities
! at a later point without compromising the APIs.
*/
***************
*** 816,820 ****
);
! /* Apply a argument tuple or dictionar to a format string and return
the resulting Unicode string. */
--- 816,820 ----
);
! /* Apply a argument tuple or dictionary to a format string and return
the resulting Unicode string. */