From a7842ab28bcdc962e2add5a4a2144873e17dda9c Mon Sep 17 00:00:00 2001 From: Robert Smallshire Date: Tue, 18 Oct 2011 18:34:03 +0200 Subject: [PATCH] Remove support for legacy numarray and Numeric packages. Now imports successfully with numpy. --- segypy.py | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/segypy.py b/segypy.py index 216b85f..36f2913 100644 --- a/segypy.py +++ b/segypy.py @@ -31,25 +31,11 @@ segy.verbose : Amount of verbose information to the screen import struct, sys # modified by A Squelch -pref_numeric_module='numarray' # FAST ON LARGE FILES -#pref_numeric_module='Numeric' -if (pref_numeric_module=='Numeric'): - # IMPORT SEPCIFIC FUNCTIONS FROM Numeric - print('SegyPY : Using Numeric module') - from Numeric import transpose - from Numeric import resize - from Numeric import reshape - from Numeric import zeros - from Numeric import arange - -else: - # IMPORT SEPCIFIC FUNCTIONS FROM numarray - print('SegyPY : Using numarray module') - from numarray import transpose - from numarray import resize - from numarray import reshape - from numarray import zeros - from numarray import arange +from numpy import transpose +from numpy import resize +from numpy import reshape +from numpy import zeros +from numpy import arange # SOME GLOBAL PARAMETERS version='0.3.1' # modified by A Squelch