[Zodb-checkins] CVS: Zope/lib/Components/ExtensionClass/src - Acquisition.c:1.59.30.1 ComputedAttribute.c:1.7.30.1 ExtensionClass.c:1.57.22.1 MethodObject.c:1.8.30.1 Missing.c:1.13.30.1 MultiMapping.c:1.11.30.1 Record.c:1.17.30.1 Sync.c:NONE

Andreas Jung andreas@andreas-jung.com
Sat, 16 Nov 2002 11:41:00 -0500


Update of /cvs-repository/Zope/lib/Components/ExtensionClass/src
In directory cvs.zope.org:/tmp/cvs-serv25404/Components/ExtensionClass/src

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	Acquisition.c ComputedAttribute.c ExtensionClass.c 
	MethodObject.c Missing.c MultiMapping.c Record.c 
Removed Files:
      Tag: ajung-restructuredtext-integration-branch
	Sync.c 
Log Message:
merge from trunk

=== Zope/lib/Components/ExtensionClass/src/Acquisition.c 1.59 => 1.59.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/Acquisition.c:1.59	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/Acquisition.c	Sat Nov 16 11:40:59 2002
@@ -1542,6 +1542,4 @@
   api = PyCObject_FromVoidPtr(&AcquisitionCAPI, NULL);
   PyDict_SetItemString(d, "AcquisitionCAPI", api);
   Py_DECREF(api);
-
-  CHECK_FOR_ERRORS("can't initialize module Acquisition");
 }


=== Zope/lib/Components/ExtensionClass/src/ComputedAttribute.c 1.7 => 1.7.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/ComputedAttribute.c:1.7	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/ComputedAttribute.c	Sat Nov 16 11:40:59 2002
@@ -117,5 +117,4 @@
 
   d = PyModule_GetDict(m);
   PyExtensionClass_Export(d,"ComputedAttribute",ComputedAttributeType);
-  CHECK_FOR_ERRORS("can't initialize module Acquisition");
 }


=== Zope/lib/Components/ExtensionClass/src/ExtensionClass.c 1.57 => 1.57.22.1 ===
--- Zope/lib/Components/ExtensionClass/src/ExtensionClass.c:1.57	Thu Aug 22 12:55:53 2002
+++ Zope/lib/Components/ExtensionClass/src/ExtensionClass.c	Sat Nov 16 11:40:59 2002
@@ -24,7 +24,6 @@
 "$Id$\n"
 ;
 
-#include <stdio.h>
 #include "ExtensionClass.h"
 
 static void


=== Zope/lib/Components/ExtensionClass/src/MethodObject.c 1.8 => 1.8.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/MethodObject.c:1.8	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/MethodObject.c	Sat Nov 16 11:40:59 2002
@@ -54,8 +54,5 @@
 
   d = PyModule_GetDict(m);
   PyExtensionClass_Export(d,"Method",MethodType);
-
-  /* Check for errors */
-  CHECK_FOR_ERRORS("can't initialize module MethodObject");
 }
 


=== Zope/lib/Components/ExtensionClass/src/Missing.c 1.13 => 1.13.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/Missing.c:1.13	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/Missing.c	Sat Nov 16 11:40:59 2002
@@ -17,7 +17,6 @@
 "\n$Id$"
 ;
 
-#include <string.h>
 #include "ExtensionClass.h"
 
 /* Declarations for objects of type Missing */
@@ -293,16 +292,26 @@
   PyDict_SetItemString(d, "Value", theValue);
   PyDict_SetItemString(d, "V", theValue); 
   PyDict_SetItemString(d, "MV", theValue); 
-	
-  /* Check for errors */
-  if (PyErr_Occurred())
-    Py_FatalError("can't initialize module Missing");
 }
 
 /*****************************************************************************
 Revision Log:
 
   $Log$
+  Revision 1.13.30.1  2002/11/16 16:40:59  andreasjung
+  merge from trunk
+
+  Revision 1.15  2002/11/13 17:45:53  jeremy
+  Remove unused Sync module.
+  Remove unnecessary Py_FatalError() calls on failed module import.
+
+  Revision 1.14  2002/11/12 20:06:00  jeremy
+  Remove bogus include.
+
+  #include <string.h> is implied by ExtensionClass.h, because it includes
+  Python.h.  Also, it is an error to include standard headers before
+  Python.h.
+
   Revision 1.13  2002/06/10 22:48:46  jeremy
   Update ExtensionClass to ZPL 2.0.
 


=== Zope/lib/Components/ExtensionClass/src/MultiMapping.c 1.11 => 1.11.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/MultiMapping.c:1.11	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/MultiMapping.c	Sat Nov 16 11:40:59 2002
@@ -12,7 +12,6 @@
 
  ****************************************************************************/
 
-#include "Python.h"
 #include "ExtensionClass.h"
 
 #define UNLESS(E) if(!(E))


=== Zope/lib/Components/ExtensionClass/src/Record.c 1.17 => 1.17.30.1 ===
--- Zope/lib/Components/ExtensionClass/src/Record.c:1.17	Mon Jun 10 18:48:46 2002
+++ Zope/lib/Components/ExtensionClass/src/Record.c	Sat Nov 16 11:40:59 2002
@@ -548,7 +548,4 @@
   d = PyModule_GetDict(m);
 
   PyExtensionClass_Export(d,"Record",RecordType);
-
-  /* Check for errors */
-  if (PyErr_Occurred()) Py_FatalError("can't initialize module Record");
 }

=== Removed File Zope/lib/Components/ExtensionClass/src/Sync.c ===