Remove unnecessary user messages or comments

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index bad6abc657a2b474a31a1b1726a58d622785f6cf..1628a517d5b19d396a97b4bbce75dfc81d64a2e0 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -24,7 +24,7 @@ import sys
 import string
 import StringIO
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.WARNING)
 
 #----------- Templates Part ---------------#
 begin_catalog_file = """# -*- coding: utf-8 -*-

diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py
index 0089e656511f159d5610c95ee62ad6e3b02d4651..e4dc070051f1f6e2a3d7d5d535a65ec6f52c1cbe 100644 (file)
--- a/bin/AdaoYacsSchemaCreator.py
+++ b/bin/AdaoYacsSchemaCreator.py
@@ -22,9 +22,9 @@ import sys
 import os
 import traceback
 import logging
-logging.basicConfig(level=logging.INFO, format='%(levelname)-8s %(message)s')
+logging.basicConfig(level=logging.WARNING, format='%(levelname)-8s %(message)s')
 
-print "-- Starting AdaoYacsSchemaCreator --"
+logging.debug("-- Starting AdaoYacsSchemaCreator --")
 
 # Check some basics variables
 if "ADAO_ROOT_DIR" not in os.environ:

diff --git a/src/daEficas/convert_adao.py b/src/daEficas/convert_adao.py
index d996df0d0fe93ce0bcb8874ec9e7c7affb4c1049..559a51c5225360375259e4054767d804ab8fc152 100644 (file)
--- a/src/daEficas/convert_adao.py
+++ b/src/daEficas/convert_adao.py
@@ -19,7 +19,7 @@
 #
 # Author: André Ribes, andre.ribes@edf.fr, EDF R&D
 
-print "import convert_adao"
+# print "import convert_adao"
 
 import convert.parseur_python
 from convert.convert_python import *

diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py
index 3ffe4d96039421a2c0faf0962e79f5f2657f518a..85535fd5d7929d510adb62631d13386ebc2b9272 100644 (file)
--- a/src/daEficas/generator_adao.py
+++ b/src/daEficas/generator_adao.py
@@ -71,7 +71,7 @@ class AdaoGenerator(PythonGenerator):
 
   def writeDefault(self, fn):
     if self.text_da_status:
-      print "write adao python command file"
+      self.logger.debug("write adao python command file")
       filename = fn[:fn.rfind(".")] + '.py'
       f = open( str(filename), 'wb')
       f.write( self.text_da )

diff --git a/src/daEficas/prefs_ADAO.py.in b/src/daEficas/prefs_ADAO.py.in
index 6056e439463f7b61d5b6b6db2dd9cbc43fd2eee6..1e1897e591bd33b08de64cd69a9fbd5a071ead07 100644 (file)
--- a/src/daEficas/prefs_ADAO.py.in
+++ b/src/daEficas/prefs_ADAO.py.in
@@ -36,22 +36,3 @@ initialdir=os.environ["PWD"]
 encoding='iso-8859-1'
 # lang indique la langue utilisee pour les chaines d'aide : fr ou ang
 lang='fr'
-
-
-# INSTALLDIR sert a localiser l'installation d'Eficas
-#INSTALLDIR=os.path.join(REPINI,'..')
-
-
-
-# Acces a la documentation
-#rep_cata        = INSTALLDIR
-#path_doc        = os.path.join(rep_cata,'Doc')
-#exec_acrobat    = "/usr/bin/xpdf"
-#savedir         = os.environ['HOME']
-
-
-# OpenTURNS Python module
-#OpenTURNS_path="/local00/home/dutka/OpenTURNS/trunk-cmake/build-autotools/install/lib/python2.4/site-packages"
-# Choix des catalogues
-#sys.path[:0]=[INSTALLDIR, OpenTURNS_path]
-