From 8e9e5f48521fd76d537e453ace801a8fd585fda1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Fri, 19 Apr 2013 11:06:48 +0200 Subject: [PATCH] Remove unnecessary user messages or comments --- bin/AdaoCatalogGenerator.py | 2 +- bin/AdaoYacsSchemaCreator.py | 4 ++-- src/daEficas/convert_adao.py | 2 +- src/daEficas/generator_adao.py | 2 +- src/daEficas/prefs_ADAO.py.in | 19 ------------------- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index bad6abc..1628a51 100644 --- 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 0089e65..e4dc070 100644 --- 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 d996df0..559a51c 100644 --- 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 3ffe4d9..85535fd 100644 --- 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 6056e43..1e1897e 100644 --- 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] - -- 2.39.2