Ticket #30331: pymol_numpy.diff

contrib/pyopengl/_glumodule.c

@@ -652 +652 @@
 #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
 #include "Extensions/arrayobject.h"
 #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
 #elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
 #include "numerical/arrayobject.h"
 #else

contrib/pyopengl/_openglmodule.c

@@ -93 +93 @@
 #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
 #include "Extensions/arrayobject.h"
 #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
 #elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
 #include "numerical/arrayobject.h"
 #else

contrib/pyopengl/openglutil.h

@@ -14 +14 @@
 #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
 #include "Extensions/arrayobject.h"
 #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
 #elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
 #include "numerical/arrayobject.h"
 #else

modules/pymol/opengl/__init__.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
 # PyOpenGL: modified for usage inside of PyMOL
 
 try:
-    import multiarray
+    import numpy.oldnumeric as multiarray
     _numeric = 1
 except ImportError:
     _numeric = 0

modules/pymol/opengl/gl/__init__.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
 import sys
 from pymol import opengl
 
@@ -13 +15 @@
 """
 
 if opengl._numeric:
-    from Numeric import ArrayType
+    from numpy.oldnumeric import ArrayType
     try:
         import _opengl_num
         _opengl = _opengl_num

modules/pymol/opengl/glu/__init__.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
 # $Id: __init__.py 336 2001-02-24 12:11:45Z wdelano $
 import sys
 from pymol import opengl
 
 if opengl._numeric:
-    from Numeric import ArrayType
+    from numpy.oldnumeric import ArrayType
     try:
         import _glu_num
         _glu = _glu_num