CCAR: suppression des catalogues (packages python) et autres packages (SD)

de sys.modules pour pouvoir importer successivement des catalogues de versions differentes

diff --git a/Aster/Cata/cataSTA10/__init__.py b/Aster/Cata/cataSTA10/__init__.py
index f6816918a5865a037ac5a21d555aa13f67b02c0d..3cdb1caf7fb0bff02a68f535b3ebc82e6f0c68e4 100644 (file)
--- a/Aster/Cata/cataSTA10/__init__.py
+++ b/Aster/Cata/cataSTA10/__init__.py
@@ -5,6 +5,13 @@ sys.path.insert(0,rep_macro)
 rep_macro=os.path.join(rep_macro,'Macro')
 sys.path.insert(0,rep_macro)
 
+if sys.modules.has_key("SD"):
+  del sys.modules["SD"]
+for k in sys.modules.keys():
+  if k[0:3] == "SD.":
+    del sys.modules[k]
+
+
 from cata import *
 from math import ceil
 from Extensions import param2

diff --git a/Aster/Cata/cataSTA9/__init__.py b/Aster/Cata/cataSTA9/__init__.py
index 83c430861d67f647fbcf1f45b33562bb18a481d9..4204daeddaaade1bc39964dc4d3d6c126379be79 100644 (file)
--- a/Aster/Cata/cataSTA9/__init__.py
+++ b/Aster/Cata/cataSTA9/__init__.py
@@ -7,6 +7,13 @@ rep_sd = os.path.dirname(__file__)
 rep_sd=os.path.join(rep_sd,'SD')
 sys.path.insert(0,rep_sd)
 
+if sys.modules.has_key("SD"):
+  del sys.modules["SD"]
+for k in sys.modules.keys():
+  if k[0:3] == "SD.":
+    del sys.modules[k]
+
+
 from cata import *
 from math import ceil
 from Extensions import param2

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 4a9896cb3d18a8d8eda52d0e708bbdd9632afef4..a882908103c24885d8cef5fef855a71f8a2eaf27 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -209,6 +209,13 @@ class READERCATA:
       nom_cata = os.path.splitext(os.path.basename(cata))[0]
       rep_cata = os.path.dirname(cata)
       sys.path[:0] = [rep_cata]
+      
+      if sys.modules.has_key(nom_cata):
+        del sys.modules[nom_cata]
+      for k in sys.modules.keys():
+        if k[0:len(nom_cata)+1] == nom_cata+'.':
+          del sys.modules[k]
+
       try :
           o=__import__(nom_cata)
           return o