[Scipy-svn] r3320 - trunk/scipy/weave

[scipy-svn@scip...]

Author: chris.burns
Date: 2007-09-18 12:59:23 -0500 (Tue, 18 Sep 2007)
New Revision: 3320

Modified:
   trunk/scipy/weave/converters.py
   trunk/scipy/weave/numpy_scalar_spec.py
Log:
Add numpy scalar converter back in.  Reference numpy.sctypes complex types instead of undefined complex192.

Modified: trunk/scipy/weave/converters.py
===================================================================
--- trunk/scipy/weave/converters.py	2007-09-18 15:04:50 UTC (rev 3319)
+++ trunk/scipy/weave/converters.py	2007-09-18 17:59:23 UTC (rev 3320)
@@ -34,11 +34,11 @@
 # add numpy scalar converters to the default
 # converter list.
 #----------------------------------------------------------------------------
-#try:
-#    import numpy_scalar_spec
-#    default.append(numpy_scalar_spec.numpy_complex_scalar_converter())
-#except ImportError:
-#    pass
+try:
+    import numpy_scalar_spec
+    default.append(numpy_scalar_spec.numpy_complex_scalar_converter())
+except ImportError:
+    pass
 
 #----------------------------------------------------------------------------
 # Add wxPython support

Modified: trunk/scipy/weave/numpy_scalar_spec.py
===================================================================
--- trunk/scipy/weave/numpy_scalar_spec.py	2007-09-18 15:04:50 UTC (rev 3319)
+++ trunk/scipy/weave/numpy_scalar_spec.py	2007-09-18 17:59:23 UTC (rev 3320)
@@ -16,5 +16,4 @@
         
         # But set this converter up to match the numpy complex 
         # types.
-        self.matching_types = [numpy.complex128, numpy.complex192,
-                               numpy.complex64]
+        self.matching_types = numpy.sctypes['complex']