Merged revisions 55342-55406 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55360 | guido.van.rossum | 2007-05-15 14:57:59 -0700 (Tue, 15 May 2007) | 2 lines
obcheckin.
........
r55361 | guido.van.rossum | 2007-05-15 14:59:18 -0700 (Tue, 15 May 2007) | 2 lines
Get rid of strop module.
........
r55367 | brett.cannon | 2007-05-15 21:06:28 -0700 (Tue, 15 May 2007) | 2 lines
Remove the 'pure' module.
........
r55369 | brett.cannon | 2007-05-15 21:07:31 -0700 (Tue, 15 May 2007) | 2 lines
Remove the lib-old directory (already empty).
........
r55370 | neal.norwitz | 2007-05-15 21:30:40 -0700 (Tue, 15 May 2007) | 1 line
Get rid of a bunch more references to strop
........
r55374 | brett.cannon | 2007-05-15 21:39:00 -0700 (Tue, 15 May 2007) | 2 lines
Complete the removal of IRIX-specific modules.
........
r55379 | brett.cannon | 2007-05-15 22:31:54 -0700 (Tue, 15 May 2007) | 2 lines
Update removed IRIX modules based on what is gone from removing plat-irix6.
........
r55388 | brett.cannon | 2007-05-16 14:34:52 -0700 (Wed, 16 May 2007) | 2 lines
Clean up the docstring for the compiler resource.
........
r55406 | brett.cannon | 2007-05-17 11:05:37 -0700 (Thu, 17 May 2007) | 2 lines
Remove BaseException.message (deprecated in Python 2.6).
........
diff --git a/Include/intobject.h b/Include/intobject.h
index 3a555d6..2778df1 100644
--- a/Include/intobject.h
+++ b/Include/intobject.h
@@ -47,10 +47,7 @@
#define PyInt_AS_LONG(op) PyLong_AsLong(op)
/* These aren't really part of the Int object, but they're handy; the protos
- * are necessary for systems that need the magic of PyAPI_FUNC and that want
- * to have stropmodule as a dynamically loaded module instead of building it
- * into the main Python shared library/DLL. Guido thinks I'm weird for
- * building it this way. :-) [cjh]
+ * are necessary for systems that need the magic of PyAPI_FUNC.
*/
PyAPI_FUNC(unsigned long) PyOS_strtoul(char *, char **, int);
PyAPI_FUNC(long) PyOS_strtol(char *, char **, int);
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 5573b73..c72a5bd 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -10,14 +10,12 @@
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
} PyBaseExceptionObject;
typedef struct {
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
PyObject *msg;
PyObject *filename;
PyObject *lineno;
@@ -30,7 +28,6 @@
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
PyObject *encoding;
PyObject *object;
PyObject *start;
@@ -42,7 +39,6 @@
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
PyObject *code;
} PySystemExitObject;
@@ -50,7 +46,6 @@
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
PyObject *myerrno;
PyObject *strerror;
PyObject *filename;
@@ -61,7 +56,6 @@
PyObject_HEAD
PyObject *dict;
PyObject *args;
- PyObject *message;
PyObject *myerrno;
PyObject *strerror;
PyObject *filename;