[Python-checkins] CVS: python/dist/src/Modules cStringIO.c,2.22,2.23 flmodule.c,1.41,1.42 getpath.c,1.26,1.27 imgfile.c,1.25,1.26 md5c.c,2.4,2.5 md5module.c,2.18,2.19 mmapmodule.c,2.19,2.20 mpzmodule.c,2.29,2.30 parsermodule.c,2.46,2.47 posixmodule.c,2.153,2.154 pypcre.c,2.19,2.20 regexpr.c,1.31,1.32 regexpr.h,1.12,1.13 resource.c,2.13,2.14 rgbimgmodule.c,2.20,2.21 rotormodule.c,2.26,2.27 stropmodule.c,2.68,2.69 sunaudiodev.c,1.20,1.21 syslogmodule.c,2.14,2.15 tclNotify.c,2.1,2.2
Thomas Wouters
python-dev@python.org
2000年7月16日 05:04:35 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11187/Modules
Modified Files:
cStringIO.c flmodule.c getpath.c imgfile.c md5c.c md5module.c
mmapmodule.c mpzmodule.c parsermodule.c posixmodule.c pypcre.c
regexpr.c regexpr.h resource.c rgbimgmodule.c rotormodule.c
stropmodule.c sunaudiodev.c syslogmodule.c tclNotify.c
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: cStringIO.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cStringIO.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** cStringIO.c 2000年07月12日 13:05:33 2.22
--- cStringIO.c 2000年07月16日 12:04:31 2.23
***************
*** 58,62 ****
"the StringIO module that is written in C. It does not provide the\n"
"full generality of StringIO, but it provides enough for most\n"
! "applications and is especially useful in conjuction with the\n"
"pickle module.\n"
"\n"
--- 58,62 ----
"the StringIO module that is written in C. It does not provide the\n"
"full generality of StringIO, but it provides enough for most\n"
! "applications and is especially useful in conjunction with the\n"
"pickle module.\n"
"\n"
Index: flmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/flmodule.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** flmodule.c 2000年07月12日 10:43:11 1.41
--- flmodule.c 2000年07月16日 12:04:31 1.42
***************
*** 23,27 ****
* the program takes precaution to ensure that only one thread can be in
* this module at any time). This will have to be fixed some time.
! * (A fix will probably also have to synchronise with the gl module).
*/
--- 23,27 ----
* the program takes precaution to ensure that only one thread can be in
* this module at any time). This will have to be fixed some time.
! * (A fix will probably also have to synchronize with the gl module).
*/
Index: getpath.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getpath.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** getpath.c 2000年07月08日 06:16:37 1.26
--- getpath.c 2000年07月16日 12:04:31 1.27
***************
*** 93,97 ****
*
* Well, almost. Once we have determined prefix and exec_prefix, the
! * preprocesor variable PYTHONPATH is used to construct a path. Each
* relative path on PYTHONPATH is prefixed with prefix. Then the directory
* containing the shared library modules is appended. The environment
--- 93,97 ----
*
* Well, almost. Once we have determined prefix and exec_prefix, the
! * preprocessor variable PYTHONPATH is used to construct a path. Each
* relative path on PYTHONPATH is prefixed with prefix. Then the directory
* containing the shared library modules is appended. The environment
Index: imgfile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/imgfile.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** imgfile.c 2000年07月10日 17:04:33 1.25
--- imgfile.c 2000年07月16日 12:04:31 1.26
***************
*** 11,15 ****
/* IMGFILE module - Interface to sgi libimage */
! /* XXX This modele should be done better at some point. It should return
** an object of image file class, and have routines to manipulate these
** image files in a neater way (so you can get rgb images off a greyscale
--- 11,15 ----
/* IMGFILE module - Interface to sgi libimage */
! /* XXX This module should be done better at some point. It should return
** an object of image file class, and have routines to manipulate these
** image files in a neater way (so you can get rgb images off a greyscale
Index: md5c.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/md5c.c,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** md5c.c 2000年07月10日 04:20:57 2.4
--- md5c.c 2000年07月16日 12:04:31 2.5
***************
*** 144,148 ****
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
! the message digest and zeroizing the context.
*/
void
--- 144,148 ----
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
! the message digest and zeroing the context.
*/
void
Index: md5module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/md5module.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** md5module.c 2000年07月10日 12:43:58 2.18
--- md5module.c 2000年07月16日 12:04:31 2.19
***************
*** 146,150 ****
feed this object with arbitrary strings using the update() method, and\n\
at any point you can ask it for the digest (a strong kind of 128-bit\n\
! checksum, a.k.a. ``fingerprint'') of the contatenation of the strings\n\
fed to it so far using the digest() method.\n\
\n\
--- 146,150 ----
feed this object with arbitrary strings using the update() method, and\n\
at any point you can ask it for the digest (a strong kind of 128-bit\n\
! checksum, a.k.a. ``fingerprint'') of the concatenation of the strings\n\
fed to it so far using the digest() method.\n\
\n\
Index: mmapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** mmapmodule.c 2000年07月09日 13:16:13 2.19
--- mmapmodule.c 2000年07月16日 12:04:31 2.20
***************
*** 702,706 ****
(len(), slicing(), sequence indexing) are limited by a C int.
! Returns -1 on error, with an apprpriate Python exception raised. On
success, the map size is returned. */
static int
--- 702,706 ----
(len(), slicing(), sequence indexing) are limited by a C int.
! Returns -1 on error, with an appropriate Python exception raised. On
success, the map size is returned. */
static int
Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** mpzmodule.c 2000年07月10日 17:14:00 2.29
--- mpzmodule.c 2000年07月16日 12:04:31 2.30
***************
*** 1636,1641 ****
int *location;
{
! /* assumptions: *alloc returns address dividable by 4,
! mpz_* routines allocate in chunks dividable by four */
fprintf(stderr, "MP_TEST_ERROR: location holds 0x%08d\n", *location );
Py_FatalError("MP_TEST_ERROR");
--- 1636,1641 ----
int *location;
{
! /* assumptions: *alloc returns address divisible by 4,
! mpz_* routines allocate in chunks divisible by four */
fprintf(stderr, "MP_TEST_ERROR: location holds 0x%08d\n", *location );
Py_FatalError("MP_TEST_ERROR");
Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -r2.46 -r2.47
*** parsermodule.c 2000年07月12日 13:05:33 2.46
--- parsermodule.c 2000年07月16日 12:04:31 2.47
***************
*** 67,71 ****
PyObject* element);
! /* The function below is copyrigthed by Stichting Mathematisch Centrum. The
* original copyright statement is included below, and continues to apply
* in full to the function immediately following. All other material is
--- 67,71 ----
PyObject* element);
! /* The function below is copyrighted by Stichting Mathematisch Centrum. The
* original copyright statement is included below, and continues to apply
* in full to the function immediately following. All other material is
***************
*** 2404,2408 ****
break;
/*
! * Fundemental statements.
*/
case expr_stmt:
--- 2404,2408 ----
break;
/*
! * Fundamental statements.
*/
case expr_stmt:
***************
*** 2553,2557 ****
res = validate_newline(CHILD(tree, j));
}
! /* This stays in to prevent any internal failues from getting to the
* user. Hopefully, this won't be needed. If a user reports getting
* this, we have some debugging to do.
--- 2553,2557 ----
res = validate_newline(CHILD(tree, j));
}
! /* This stays in to prevent any internal failures from getting to the
* user. Hopefully, this won't be needed. If a user reports getting
* this, we have some debugging to do.
Index: posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.153
retrieving revision 2.154
diff -C2 -r2.153 -r2.154
*** posixmodule.c 2000年07月14日 14:28:33 2.153
--- posixmodule.c 2000年07月16日 12:04:31 2.154
***************
*** 1361,1365 ****
path: path of executable file\n\
args: tuple or list of arguments\n\
! env: dictonary of strings mapping to strings";
static PyObject *
--- 1361,1365 ----
path: path of executable file\n\
args: tuple or list of arguments\n\
! env: dictionary of strings mapping to strings";
static PyObject *
***************
*** 1559,1563 ****
path: path of executable file\n\
args: tuple or list of arguments\n\
! env: dictonary of strings mapping to strings";
static PyObject *
--- 1559,1563 ----
path: path of executable file\n\
args: tuple or list of arguments\n\
! env: dictionary of strings mapping to strings";
static PyObject *
***************
*** 1701,1705 ****
#else
/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
! functions, eventhough they are included in libutil. */
#include <termios.h>
extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
--- 1701,1705 ----
#else
/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
! functions, even though they are included in libutil. */
#include <termios.h>
extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
***************
*** 3898,3902 ****
* It maps strings representing configuration variable names to
* integer values, allowing those functions to be called with the
! * magic names instead of poluting the module's namespace with tons of
* rarely-used constants. There are three separate tables that use
* these definitions.
--- 3898,3902 ----
* It maps strings representing configuration variable names to
* integer values, allowing those functions to be called with the
! * magic names instead of polluting the module's namespace with tons of
* rarely-used constants. There are three separate tables that use
* these definitions.
Index: pypcre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pypcre.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** pypcre.c 2000年07月05日 22:56:52 2.19
--- pypcre.c 2000年07月16日 12:04:31 2.20
***************
*** 494,498 ****
caseless = ((re->options | options) & PCRE_CASELESS) != 0;
! /* For an anchored pattern, or an unchored pattern that has a first char, or a
multiline pattern that matches only at "line starts", no further processing at
present. */
--- 494,498 ----
caseless = ((re->options | options) & PCRE_CASELESS) != 0;
! /* For an anchored pattern, or an unanchored pattern that has a first char, or a
multiline pattern that matches only at "line starts", no further processing at
present. */
***************
*** 1637,1642 ****
}
! /* If the mininum is 1 and the previous item was a character string,
! we either have to put back the item that got cancelled if the string
length was 1, or add the character back onto the end of a longer
string. For a character type nothing need be done; it will just get
--- 1637,1642 ----
}
! /* If the minimum is 1 and the previous item was a character string,
! we either have to put back the item that got canceled if the string
length was 1, or add the character back onto the end of a longer
string. For a character type nothing need be done; it will just get
***************
*** 1650,1654 ****
/* For a single negated character we also have to put back the
! item that got cancelled. */
else if (*previous == OP_NOT) code++;
--- 1650,1654 ----
/* For a single negated character we also have to put back the
! item that got canceled. */
else if (*previous == OP_NOT) code++;
Index: regexpr.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/regexpr.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** regexpr.c 2000年07月10日 13:05:28 1.31
--- regexpr.c 2000年07月16日 12:04:31 1.32
***************
*** 125,129 ****
struct
{
! /* index into the curent page. If index == 0 and you need
* to pop an item, move to the previous page and set index
* = STACK_PAGE_SIZE - 1. Otherwise decrement index to
--- 125,129 ----
struct
{
! /* index into the current page. If index == 0 and you need
* to pop an item, move to the previous page and set index
* = STACK_PAGE_SIZE - 1. Otherwise decrement index to
Index: regexpr.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/regexpr.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** regexpr.h 1997年09月03日 00:47:36 1.12
--- regexpr.h 2000年07月16日 12:04:31 1.13
***************
*** 120,124 ****
int re_search(regexp_t compiled, unsigned char *string, int size, int startpos,
int range, regexp_registers_t regs);
! /* This rearches for a substring matching the regexp. This returns the
* first index at which a match is found. range specifies at how many
* positions to try matching; positive values indicate searching
--- 120,124 ----
int re_search(regexp_t compiled, unsigned char *string, int size, int startpos,
int range, regexp_registers_t regs);
! /* This searches for a substring matching the regexp. This returns the
* first index at which a match is found. range specifies at how many
* positions to try matching; positive values indicate searching
Index: resource.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/resource.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** resource.c 2000年07月10日 12:15:54 2.13
--- resource.c 2000年07月16日 12:04:31 2.14
***************
*** 71,76 ****
ru.ru_msgrcv, /* messages received */
ru.ru_nsignals, /* signals received */
! ru.ru_nvcsw, /* voluntary context switchs */
! ru.ru_nivcsw /* involuntary context switchs */
);
}
--- 71,76 ----
ru.ru_msgrcv, /* messages received */
ru.ru_nsignals, /* signals received */
! ru.ru_nvcsw, /* voluntary context switches */
! ru.ru_nivcsw /* involuntary context switches */
);
}
Index: rgbimgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rgbimgmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** rgbimgmodule.c 2000年07月10日 10:49:30 2.20
--- rgbimgmodule.c 2000年07月16日 12:04:31 2.21
***************
*** 554,558 ****
* the pixel array. zsize specifies what kind of image file to
* write out. if zsize is 1, the luminance of the pixels are
! * calculated, and a sinlge channel black and white image is saved.
* If zsize is 3, an RGB image file is saved. If zsize is 4, an
* RGBA image file is saved.
--- 554,558 ----
* the pixel array. zsize specifies what kind of image file to
* write out. if zsize is 1, the luminance of the pixels are
! * calculated, and a single channel black and white image is saved.
* If zsize is 3, an RGB image file is saved. If zsize is 4, an
* RGBA image file is saved.
Index: rotormodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rotormodule.c,v
retrieving revision 2.26
retrieving revision 2.27
diff -C2 -r2.26 -r2.27
*** rotormodule.c 2000年07月10日 22:41:30 2.26
--- rotormodule.c 2000年07月16日 12:04:31 2.27
***************
*** 24,28 ****
/* This creates an encryption and decryption engine I am calling
! a rotor due to the original design was a harware rotor with
contacts used in Germany during WWII.
--- 24,28 ----
/* This creates an encryption and decryption engine I am calling
! a rotor due to the original design was a hardware rotor with
contacts used in Germany during WWII.
***************
*** 44,48 ****
established via the {en,de}crypt calls. They will NOT
re-initalize the rotors unless: 1) They have not been
! initalized with {en,de}crypt since the last setkey() call;
2) {en,de}crypt has not been called for this rotor yet.
--- 44,48 ----
established via the {en,de}crypt calls. They will NOT
re-initalize the rotors unless: 1) They have not been
! initialized with {en,de}crypt since the last setkey() call;
2) {en,de}crypt has not been called for this rotor yet.
***************
*** 210,214 ****
! /* These routines impliment the rotor itself */
/* Here is a fairly sophisticated {en,de}cryption system. It is based on
--- 210,214 ----
! /* These routines implement the rotor itself */
/* Here is a fairly sophisticated {en,de}cryption system. It is based on
***************
*** 218,222 ****
used to encrypt one character.
! The code is smart enought to tell if your alphabet has a number of
characters equal to a power of two. If it does, it uses logical
operations, if not it uses div and mod (both require a division).
--- 218,222 ----
used to encrypt one character.
! The code is smart enough to tell if your alphabet has a number of
characters equal to a power of two. If it does, it uses logical
operations, if not it uses div and mod (both require a division).
Index: stropmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.68
retrieving revision 2.69
diff -C2 -r2.68 -r2.69
*** stropmodule.c 2000年07月12日 13:05:33 2.68
--- stropmodule.c 2000年07月16日 12:04:31 2.69
***************
*** 168,172 ****
\n\
Return a string composed of the words in list, with\n\
! intervening occurences of sep. Sep defaults to a single\n\
space.\n\
\n\
--- 168,172 ----
\n\
Return a string composed of the words in list, with\n\
! intervening occurrences of sep. Sep defaults to a single\n\
space.\n\
\n\
***************
*** 1041,1048 ****
mymemreplace
! Return a string in which all occurences of PAT in memory STR are
replaced with SUB.
! If length of PAT is less than length of STR or there are no occurences
of PAT in STR, then the original string is returned. Otherwise, a new
string is allocated here and returned.
--- 1041,1048 ----
mymemreplace
! Return a string in which all occurrences of PAT in memory STR are
replaced with SUB.
! If length of PAT is less than length of STR or there are no occurrences
of PAT in STR, then the original string is returned. Otherwise, a new
string is allocated here and returned.
Index: sunaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/sunaudiodev.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** sunaudiodev.c 2000年07月10日 17:25:37 1.20
--- sunaudiodev.c 2000年07月16日 12:04:31 1.21
***************
*** 259,263 ****
return NULL;
}
! /* x_ocount is in bytes, wheras play.samples is in frames */
/* we want frames */
return PyInt_FromLong(self->x_ocount / (ai.play.channels *
--- 259,263 ----
return NULL;
}
! /* x_ocount is in bytes, whereas play.samples is in frames */
/* we want frames */
return PyInt_FromLong(self->x_ocount / (ai.play.channels *
Index: syslogmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** syslogmodule.c 2000年07月10日 12:29:26 2.14
--- syslogmodule.c 2000年07月16日 12:04:31 2.15
***************
*** 37,41 ****
- Added PyErr_Clear() call(s) where needed.
- Fix core dumps if user message contains format specifiers.
! - Change openlog arg defaults to match normal syslog behaviour.
- Plug memory leak in openlog().
- Fix setlogmask() to return previous mask value.
--- 37,41 ----
- Added PyErr_Clear() call(s) where needed.
- Fix core dumps if user message contains format specifiers.
! - Change openlog arg defaults to match normal syslog behavior.
- Plug memory leak in openlog().
- Fix setlogmask() to return previous mask value.
Index: tclNotify.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/tclNotify.c,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -r2.1 -r2.2
*** tclNotify.c 1997年09月28日 05:52:41 2.1
--- tclNotify.c 2000年07月16日 12:04:31 2.2
***************
*** 120,124 ****
*
* Side effects:
! * Clears the notifier intialization flag.
*
*----------------------------------------------------------------------
--- 120,124 ----
*
* Side effects:
! * Clears the notifier initialization flag.
*
*----------------------------------------------------------------------
***************
*** 203,207 ****
*
* Side effects:
! * The given event source is cancelled, so its procedure will
* never again be called. If no such source exists, nothing
* happens.
--- 203,207 ----
*
* Side effects:
! * The given event source is canceled, so its procedure will
* never again be called. If no such source exists, nothing
* happens.