From e340cb9d27a1fa156432865252a8186e6066b4ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 9 Mar 2011 15:24:08 +0100 Subject: [PATCH] =?utf8?q?D=C3=A9placement=20de=20enumerate=20dans=20daUti?= =?utf8?q?ls?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/daSalome/daGUI/daGuiImpl/Makefile.am | 3 +-- src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py | 2 +- src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py | 2 +- src/daSalome/daGUI/daUtils/Makefile.am | 3 ++- src/daSalome/daGUI/daUtils/adaoEficasEvent.py | 2 +- src/daSalome/daGUI/{daGuiImpl => daUtils}/enumerate.py | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename src/daSalome/daGUI/{daGuiImpl => daUtils}/enumerate.py (100%) diff --git a/src/daSalome/daGUI/daGuiImpl/Makefile.am b/src/daSalome/daGUI/daGuiImpl/Makefile.am index 4f2d529..4ea27e7 100644 --- a/src/daSalome/daGUI/daGuiImpl/Makefile.am +++ b/src/daSalome/daGUI/daGuiImpl/Makefile.am @@ -29,7 +29,6 @@ mypkgpython_PYTHON = \ adaoModuleHelper.py \ adaoStudyEditor.py \ adaoLogger.py \ - adaoCase.py \ - enumerate.py + adaoCase.py diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py index 5eb13a9..61730ad 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py @@ -32,7 +32,7 @@ from PyQt4 import QtGui,QtCore import SalomePyQt sgPyQt = SalomePyQt.SalomePyQt() -from daGuiImpl.enumerate import Enumerate +from daUtils.enumerate import Enumerate from daGuiImpl.adaoCase import AdaoCase from daEficasWrapper.adaoEficasWrapper import AdaoEficasWrapper diff --git a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py index 52bb64c..454ce6e 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py @@ -20,7 +20,7 @@ __author__="aribes/gboulant" -from enumerate import Enumerate +from daUtils.enumerate import Enumerate from salome.kernel import studyedit diff --git a/src/daSalome/daGUI/daUtils/Makefile.am b/src/daSalome/daGUI/daUtils/Makefile.am index db22a45..9315c40 100644 --- a/src/daSalome/daGUI/daUtils/Makefile.am +++ b/src/daSalome/daGUI/daUtils/Makefile.am @@ -23,5 +23,6 @@ mypkgpythondir =$(salomepythondir)/daUtils mypkgpython_PYTHON = \ __init__.py \ - adaoEficasEvent.py + adaoEficasEvent.py \ + enumerate.py diff --git a/src/daSalome/daGUI/daUtils/adaoEficasEvent.py b/src/daSalome/daGUI/daUtils/adaoEficasEvent.py index f739253..769aec1 100644 --- a/src/daSalome/daGUI/daUtils/adaoEficasEvent.py +++ b/src/daSalome/daGUI/daUtils/adaoEficasEvent.py @@ -30,7 +30,7 @@ class DevelException(Exception): # Interface of an eficas observer (for implementing the subject/observer pattern) # ============================================================================== # -from daGuiImpl.enumerate import Enumerate +from enumerate import Enumerate class EficasObserver: """ diff --git a/src/daSalome/daGUI/daGuiImpl/enumerate.py b/src/daSalome/daGUI/daUtils/enumerate.py similarity index 100% rename from src/daSalome/daGUI/daGuiImpl/enumerate.py rename to src/daSalome/daGUI/daUtils/enumerate.py -- 2.39.2