From 25a669095d4d40f7ec984b2fe55ebcaeca513dd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= <> Date: Wed, 19 May 2010 07:35:13 +0000 Subject: [PATCH] - Remove tkinter dependency - Use numpy if Numeric not found --- Extensions/param2.py | 7 ++++++- InterfaceQT4/compoerror.py | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Extensions/param2.py b/Extensions/param2.py index e91e3e1b..3259ce30 100644 --- a/Extensions/param2.py +++ b/Extensions/param2.py @@ -1,9 +1,14 @@ # -*- coding: utf-8 -*- from __future__ import division import math -import Numeric import types +try: + import Numeric +except: + import numpy + Numeric = numpy + def mkf(value): if type(value) in (type(1), type(1L), type(1.5), type(1j),type("hh")) : return Constant(value) diff --git a/InterfaceQT4/compoerror.py b/InterfaceQT4/compoerror.py index 305039f0..af2d3c95 100644 --- a/InterfaceQT4/compoerror.py +++ b/InterfaceQT4/compoerror.py @@ -19,7 +19,6 @@ # # ====================================================================== # Modules Python -from Tkinter import Label,Button #Modules Eficas from Noyau.N_OBJECT import ErrorObj -- 2.39.2