Remove Numeric support

mcfletch · Jul 11, 2013 · 6705b15 · 6705b15
1 parent fb58787
commit 6705b15
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 291 deletions.
diff --git a/OpenGL/__init__.py b/OpenGL/__init__.py
@@ -64,9 +64,6 @@
         testing stages to prevent raising errors on
         recoverable conditions at run-time.
 
-        Note: this feature does not currently work with
-            numarray or Numeric arrays.
-
         Default: False
 
     CONTEXT_CHECKING -- if set to True, PyOpenGL will wrap
@@ -225,6 +222,5 @@
 )
 FormatHandler( 'ctypespointer', 'OpenGL.arrays.ctypespointers.CtypesPointerHandler' )
 FormatHandler( 'numpy', 'OpenGL.arrays.numpymodule.NumpyHandler', ['numpy.ndarray'] )
-FormatHandler( 'numeric', 'OpenGL.arrays.numeric.NumericHandler', )
 FormatHandler( 'vbo', 'OpenGL.arrays.vbo.VBOHandler', ['OpenGL.arrays.vbo.VBO','OpenGL_accelerate.vbo.VBO'] )
 FormatHandler( 'vbooffset', 'OpenGL.arrays.vbo.VBOOffsetHandler', ['OpenGL.arrays.vbo.VBOOffset','OpenGL_accelerate.vbo.VBOOffset'] )
diff --git a/OpenGL/arrays/_numeric.py b/OpenGL/arrays/_numeric.py
diff --git a/OpenGL/arrays/numeric.py b/OpenGL/arrays/numeric.py
diff --git a/OpenGL_accelerate/src/_arrays.c b/OpenGL_accelerate/src/_arrays.c
diff --git a/OpenGL_accelerate/src/_numarrayarrays.c b/OpenGL_accelerate/src/_numarrayarrays.c
diff --git a/documentation/pydoc/builddocs.py b/documentation/pydoc/builddocs.py
@@ -22,7 +22,6 @@ def isbuiltin( obj ):
 
 if __name__ == "__main__":
     excludes = [
-        "Numeric",
         "numpy",
         "_tkinter",
         "Tkinter",
@@ -45,4 +44,4 @@ def isbuiltin( obj ):
         exclusions = excludes,
         recursionStops = stops,
     ).process ()
-
+
diff --git a/documentation/using.html b/documentation/using.html
@@ -526,7 +526,7 @@ <h2><a name="Performance"></a>Performance Tips for Python + OpenGL</h2>
 
 <p>Array based geometry uses OpenGL 1.1 features (supported almost
 everywhere) that allow for passing large arrays of data to be processed
-with a single call. &nbsp;Using numpy (or Numeric) arrays, you can
+with a single call. &nbsp;Using numpy arrays, you can
 readily pass your data into those functions without any need for
 Python-level iteration. &nbsp;This is the more flexible of the two
 approaches, as it allows for readily mutating the data being rendered
@@ -750,37 +750,8 @@ <h2><a name="upgrading"></a>Upgrading</h2>
   <li>setuptools required</li><ul><li>You *must* run
 setuptools installation in order to register the egg entry points, if
 you do not you will have *no* data formats supported and nothing will
-work at all</li></ul><li>numpy versus Numeric</li>
-
-
-
-
-
-
-
-
-
-
-  <ul>
-
-
-
-
-
-    <li>PyOpenGL 2.x used (only) the older "Numeric" module.
-&nbsp;PyOpenGL 3.x can use Numeric (with an optional C extension), but
-uses numpy by default.</li>
-
-
-
-
-
-
-
-
-
-
-  </ul><li>strings deprecated as array return-types for all save image data</li><ul><li>PyOpenGL
+work at all</li></ul>
+<li>strings deprecated as array return-types for all save image data</li><ul><li>PyOpenGL
 2.x would normally return your GL_UNSIGNED_BYTE data as strings.
 &nbsp;We continue to support this for image operations (glGetTexImage,
 glReadPixels), but we provide a way to turn off the behaviour and
@@ -888,4 +859,4 @@ <h2><a name="upgrading"></a>Upgrading</h2>
 
 
 
-</body></html>
+</body></html>